process1

Cruiser/Cruiser/AbstractStrategy.cs

@@ -1,20 +1,37 @@
-using Cruiser;
-using Cruiser.MovementStrategy;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
+
 namespace Cruiser.MovementStrategy
 {
     public abstract class AbstractStrategy
     {
         private IMoveableObject? _moveableObject;
+        /// <summary>
+        /// Статус перемещения
+        /// </summary>
         private Status _state = Status.NotInit;
+        /// <summary>
+        /// Ширина поля
+        /// </summary>
         protected int FieldWidth { get; private set; }
+        /// <summary>
+        /// Высота поля
+        /// </summary>
         protected int FieldHeight { get; private set; }
+        /// <summary>
+        /// Статус перемещения
+        /// </summary>
         public Status GetStatus() { return _state; }
+        /// <summary>
+        /// Установка данных
+        /// </summary>
+        /// <param name="moveableObject">Перемещаемый объект</param>
+        /// <param name="width">Ширина поля</param>
+        /// <param name="height">Высота поля</param>
         public void SetData(IMoveableObject moveableObject, int width, int
         height)
         {
@@ -28,6 +45,9 @@ namespace Cruiser.MovementStrategy
             FieldWidth = width;
             FieldHeight = height;
         }
+        /// <summary>
+        /// Шаг перемещения
+        /// </summary>
         public void MakeStep()
         {
             if (_state != Status.InProgress)
@@ -41,12 +61,35 @@ namespace Cruiser.MovementStrategy
             }
             MoveToTarget();
         }
+        /// <summary>
+        /// Перемещение влево
+        /// </summary>
+        /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
         protected bool MoveLeft() => MoveTo(Direction.Left);
+        /// <summary>
+        /// Перемещение вправо
+        /// </summary>
+        /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
         protected bool MoveRight() => MoveTo(Direction.Right);
+        /// <summary>
+        /// Перемещение вверх
+        /// </summary>
+        /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
         protected bool MoveUp() => MoveTo(Direction.Up);
+        /// <summary>
+        /// Перемещение вниз
+        /// </summary>
+        /// <returns>Результат перемещения (true - удалось переместиться,false - неудача)</returns>
         protected bool MoveDown() => MoveTo(Direction.Down);
+        /// <summary>
+        /// Параметры объекта
+        /// </summary>
         protected ObjectParameters? GetObjectParameters =>
                _moveableObject?.GetObjectPosition;
+        /// <summary>
+        /// Шаг объекта
+        /// </summary>
+        /// <returns></returns>
         protected int? GetStep()
         {
             if (_state != Status.InProgress)
@@ -55,17 +98,29 @@ namespace Cruiser.MovementStrategy
             }
             return _moveableObject?.GetStep;
         }
+        /// <summary>
+        /// Перемещение к цели
+        /// </summary>
         protected abstract void MoveToTarget();
+        /// <summary>
+        /// Достигнута ли цель
+        /// </summary>
+        /// <returns></returns>
         protected abstract bool IsTargetDestinaion();
-        private bool MoveTo(Direction direction)
+        /// <summary>
+        /// Попытка перемещения в требуемом направлении
+        /// </summary>
+        /// <param name="directionType">Направление</param>
+        /// <returns>Результат попытки (true - удалось переместиться, false - неудача)</returns>
+        private bool MoveTo(Direction directionType)
         {
             if (_state != Status.InProgress)
             {
                 return false;
             }
-            if (_moveableObject?.CheckCanMove(direction) ?? false)
+            if (_moveableObject?.CheckCanMove(directionType) ?? false)
             {
-                _moveableObject.MoveObject(direction);
+                _moveableObject.MoveObject(directionType);
                 return true;
             }
             return false;

Cruiser/Cruiser/CarsGenericCollection.cs

@@ -0,0 +1,147 @@
+using CruiserGenerics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+//using Cruiser.Drawnings;
+//using Cruiser.MovementStrategy;
+
+namespace Cruiser.Generics
+{
+    internal class CarsGenericCollection<T, U>
+    
+        where T : DrawningCruiser
+        where U : IMoveableObject
+    {
+        /// <summary>
+        /// Ширина окна прорисовки
+        /// </summary>
+        private readonly int _pictureWidth;
+        /// <summary>
+        /// Высота окна прорисовки
+        /// </summary>
+        private readonly int _pictureHeight;
+        /// <summary>
+        /// Размер занимаемого объектом места (ширина)
+        /// </summary>
+        private readonly int _placeSizeWidth = 210;
+        /// <summary>
+        /// Размер занимаемого объектом места (высота)
+        /// </summary>
+        private readonly int _placeSizeHeight = 90;
+        /// <summary>
+        /// Набор объектов
+        /// </summary>
+        private readonly SetGeneric<T> _collection;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="picWidth"></param>
+        /// <param name="picHeight"></param>
+        public CarsGenericCollection(int picWidth, int picHeight)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _collection = new SetGeneric<T>(width * height);
+        }
+        /// <summary>
+        /// Перегрузка оператора сложения
+        /// </summary>
+        /// <param name="collect"></param>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static T? operator +(CarsGenericCollection<T, U> collect, T?
+        obj)
+        {
+            if (obj == null)
+            {
+                return null;
+            }
+            return collect?._collection.Insert(obj) ?? null;
+        }
+        /// <summary>
+        /// Перегрузка оператора вычитания
+        /// </summary>
+        /// <param name="collect"></param>
+        /// <param name="pos"></param>
+        /// <returns></returns>
+        public static T? operator -(CarsGenericCollection<T, U> collect, int
+        pos)
+        {
+            T? obj = collect._collection.Get(pos);
+            if (obj != null)
+            {
+                collect._collection.Remove(pos);
+            }
+            return obj;
+        }
+        /// <summary>
+        /// Получение объекта IMoveableObject
+        /// </summary>
+        /// <param name="pos"></param>
+        /// <returns></returns>
+        public U? GetU(int pos)
+        {
+            return (U?)_collection.Get(pos)?.GetMoveableObject;
+        }
+        /// <summary>
+        /// Вывод всего набора объектов
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowCars()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawObjects(gr);
+            return bmp;
+        }
+        /// <summary>
+        /// Метод отрисовки фона
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawBackground(Graphics g)
+        {
+            Pen pen = new(Color.Black, 3);
+            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
+            {
+                for (int j = 0; j < _pictureHeight / _placeSizeHeight +
+                1; ++j)
+                {//линия рамзетки места
+                    g.DrawLine(pen, i * _placeSizeWidth, j *
+                    _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j *
+                    _placeSizeHeight);
+                }
+                g.DrawLine(pen, i * _placeSizeWidth, 0, i *
+                _placeSizeWidth, _pictureHeight / _placeSizeHeight * _placeSizeHeight);
+            }
+        }
+        /// <summary>
+        /// Метод прорисовки объектов
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawObjects(Graphics g)
+        {
+            DrawningCruiser car;
+            int numPlacesInRow = _pictureWidth / _placeSizeWidth;
+            for (int i = 0; i < _collection.Count; i++)
+            {
+                // TODO получение объекта
+                // TODO установка позиции
+                // TODO прорисовка объекта
+                car = _collection.Get(i);
+                if (car != null)
+                {
+                    car.SetPosition((i % numPlacesInRow) * _placeSizeWidth + _placeSizeWidth / 20, _placeSizeHeight * (i / numPlacesInRow) + _placeSizeHeight / 10);
+                    //car.SetPosition(_placeSizeWidth * (i/ numPlacesInColumn) + _placeSizeWidth / 20, (i % numPlacesInColumn ) *_placeSizeHeight + _placeSizeHeight / 10);
+                    car.DrawTransport(g);
+
+                }
+            }
+        }
+    }
+}
+  

Cruiser/Cruiser/Cruiser.cs

@@ -8,10 +8,28 @@ namespace Cruiser.Entities
 {
     public class EntityCruiser
     {
+
         public int Speed { get; private set; }
+
+
+
         public double Weight { get; private set; }
+
         public Color BodyColor { get; private set; }
+
+        // public Color AdditionalColor { get; private set; }
+
+
+        // public bool Headlights { get; private set; }
+        // public bool HelicopterPad { get; private set; }
+
+        // public bool Coating { get; private set; }
         public double Step => (double)Speed * 100 / Weight;
+
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес автомобиля</param>
+        /// <param name="bodyColor">Основной цвет</param>
+
         public EntityCruiser(int speed, double weight, Color bodyColor)
         {
             Speed = speed;

Cruiser/Cruiser/CruiserForm.Designer.cs

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

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

Cruiser/Cruiser/Direction.cs

@@ -8,9 +8,23 @@ namespace Cruiser
 {
     public enum Direction
     {
+        /// Вверх
+
+        /// </summary>
         Up = 1,
+        /// <summary>
+        /// Вниз
+        /// </summary>
         Down = 2,
+        /// <summary>
+        /// Влево
+        /// </summary>
         Left = 3,
+        /// <summary>
+        /// Вправо
+        /// </summary>
         Right = 4
     }
-}
+}
+
+

Cruiser/Cruiser/DrawningAdvancedCruiser.cs

@@ -1,47 +0,0 @@
-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;
-            }
-            Pen pen = new Pen(Color.Black);
-            Brush addBrush = new SolidBrush(cruiser.AdditionalColor);
-            Brush brush = new SolidBrush(cruiser.BodyColor);
-            base.DrawTransport(g);
-            if (cruiser.HelicopterPad)
-            {
-                Brush brYellow = new SolidBrush(Color.Yellow);
-                g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 5, 20,
-                20);
-                g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 35, 20,
-                20);
-            }
-            if (cruiser.Coating)
-            {
-                g.FillEllipse(Brushes.Green, _startPosX + 90, _startPosY + 20, 20, 20);
-
-            }
-            }
-        }
-    }

Cruiser/Cruiser/DrawningCruiser.cs

@@ -4,24 +4,50 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Cruiser.Entities;
-using Cruiser.MovementStrategy;
 
 namespace Cruiser.DrawningObjects
 {
     public class DrawningCruiser
     {
+
         public EntityCruiser? EntityCruiser { get; protected set; }
+
         private int _pictureWidth;
+
         private int _pictureHeight;
+
         protected int _startPosX;
+
         protected int _startPosY;
-        private readonly int _cruiserWidth = 110;
-        private readonly int _cruiserHeight = 60;
+
+        private readonly int _cruiserWidth = 150;
+
+
+        private readonly int _cruiserHeight = 50;
+
         public int GetPosX => _startPosX;
+        /// <summary>
+        /// Координата Y объекта
+        /// </summary>
         public int GetPosY => _startPosY;
+        /// <summary>
+        /// Ширина объекта
+        /// </summary>
         public int GetWidth => _cruiserWidth;
+        /// <summary>
+        /// Высота объекта
+        /// </summary>
         public int GetHeight => _cruiserHeight;
+
         public IMoveableObject GetMoveableObject => new DrawningObjectCruiser(this);
+
+
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param>
+
         public DrawningCruiser(int speed, double weight, Color bodyColor, int width, int height)
         {
             if (width < _cruiserWidth || height < _cruiserHeight)
@@ -30,10 +56,15 @@ namespace Cruiser.DrawningObjects
             }
             _pictureWidth = width;
             _pictureHeight = height;
+
             EntityCruiser = new EntityCruiser(speed, weight, bodyColor);
+
+
+
         }
+
         protected DrawningCruiser(int speed, double weight, Color bodyColor, int
-width, int height, int cruiserWidth, int cruiserHeight)
+width, int height, int carWidth, int carHeight)
         {
             if (width <= _cruiserWidth || height <= _cruiserHeight)
             {
@@ -41,23 +72,33 @@ width, int height, int cruiserWidth, int cruiserHeight)
             }
             _pictureWidth = width;
             _pictureHeight = height;
-            _cruiserWidth = cruiserWidth;
-            _cruiserHeight = cruiserHeight;
+            _cruiserWidth = carWidth;
+            _cruiserHeight = carHeight;
             EntityCruiser = new EntityCruiser(speed, weight, bodyColor);
         }
+
+
+
+
+
+
+
+
+        /// <param name="x">Координата X</param>
+        /// <param name="y">Координата Y</param>
         public void SetPosition(int x, int y)
         {
-            if (x < 0 || x + _cruiserWidth > _pictureWidth)
+            if (x < 0 || x >= _pictureWidth || y < 0 || y >= _pictureHeight)
             {
-                x = Math.Max(0, _pictureWidth - _cruiserWidth);
-            }
-            if (y < 0 || y + _cruiserHeight > _pictureHeight)
-            {
-                y = Math.Max(0, _pictureHeight - _cruiserHeight);
+                _startPosX = 0;
+                _startPosY = 0;
             }
             _startPosX = x;
             _startPosY = y;
+
         }
+
+        /// <param name="direction">Направление</param>
         public void MoveTransport(Direction direction)
         {
             if (!CanMove(direction) || EntityCruiser == null)
@@ -66,18 +107,25 @@ width, int height, int cruiserWidth, int cruiserHeight)
             }
             switch (direction)
             {
+                //влево
                 case Direction.Left:
                     _startPosX -= (int)EntityCruiser.Step;
                     break;
+                //вверх
                 case Direction.Up:
                     _startPosY -= (int)EntityCruiser.Step;
                     break;
+                // вправо
                 case Direction.Right:
                     _startPosX += (int)EntityCruiser.Step;
                     break;
+                //вниз
                 case Direction.Down:
                     _startPosY += (int)EntityCruiser.Step;
                     break;
+
+
+
             }
         }
         public bool CanMove(Direction direction)
@@ -88,13 +136,19 @@ width, int height, int cruiserWidth, int cruiserHeight)
             }
             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,
             };
         }
+
+        /// <param name="g"></param>
         public virtual void DrawTransport(Graphics g)
         {
             if (EntityCruiser == null)
@@ -103,27 +157,67 @@ width, int height, int cruiserWidth, int cruiserHeight)
             }
             Pen pen = new Pen(Color.Black);
             Brush brush = new SolidBrush(EntityCruiser.BodyColor);
+            //SolidBrush(Cruiser.AdditionalColor);
+
+
+            //границы автомобиля
+
+
             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(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);
+
+            /*  if (Cruiser.HelicopterPad)
+              {
+                  //если есть площадка под вертолет
+                  g.DrawEllipse(pen, _startPosX + 90, _startPosY + 20, 20, 20);
+              }
+              if (Cruiser.Coating)
+              {
+                  //если есть спец покрытие для площадки под вертолет
+                  g.FillEllipse(Brushes.Red, _startPosX + 90, _startPosY + 20, 20, 20);
+              }*/
+
         }
     }
-}
+}
+
+

Cruiser/Cruiser/DrawningObjectCa.cs

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

Cruiser/Cruiser/DrawningObjectCruiser.cs

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

@@ -0,0 +1,57 @@
+using Cruiser.DrawningObjects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Cruiser.Entities;
+using Cruiser;
+
+namespace Cruiser.DrawningObjects
+{
+
+    public class DrawningPro : DrawningCruiser
+    {
+        public DrawningPro(int speed, double weight, Color bodyColor, Color additionalColor, bool headlights, bool helicopterPad, bool coating, int width, int height) : base(speed, weight, bodyColor, width, height, 150, 50)
+        {
+            if (EntityCruiser != null)
+            {
+                EntityCruiser = new Pro(speed, weight, bodyColor, additionalColor, headlights, helicopterPad, coating);
+            }
+        }
+        public override void DrawTransport(Graphics g)
+        {
+            if (EntityCruiser is not Pro cruiser)
+            {
+                return;
+            }
+
+            Pen pen = new Pen(Color.Black);
+            Brush addBrush = new SolidBrush(cruiser.AdditionalColor);
+            Brush brush = new SolidBrush(cruiser.BodyColor);
+
+            base.DrawTransport(g);
+            if (cruiser.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);
+            }
+
+            if (cruiser.HelicopterPad)
+            {
+                //если есть площадка под вертолет
+                g.DrawEllipse(pen, _startPosX + 90, _startPosY + 20, 20, 20);
+            }
+
+            /* if (cruiser.Coating)
+            {
+                //если есть спец покрытие для площадки под вертолет
+                g.FillEllipse(Brushes.Red, _startPosX + 90, _startPosY + 20, 20, 20);
+            }*/
+        }
+    }
+}

Cruiser/Cruiser/Form1.Designer.cs

@@ -0,0 +1,194 @@
+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();
+            ((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;
+            // 
+            // 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(36, 302);
+            this.buttonCreate.Name = "buttonCreate";
+            this.buttonCreate.Size = new System.Drawing.Size(112, 34);
+            this.buttonCreate.TabIndex = 5;
+            this.buttonCreate.Text = "Создать";
+            this.buttonCreate.UseVisualStyleBackColor = true;
+            this.buttonCreate.Click += new System.EventHandler(this.ButtonCreateSportCar_Click);
+            // 
+            // CruiserForm
+            // 
+            this.ClientSize = new System.Drawing.Size(667, 358);
+            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>
+        private void ButtonCreateSportCar_Click(object sender, EventArgs e)
+        {
+            Random random = new();
+            _drawningCruiser = new DrawningCruiser();
+            _drawningCruiser.Init(random.Next(100, 300),
+            random.Next(1000, 3000),
+            Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
+            random.Next(0, 256)),
+            Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
+            random.Next(0, 256)),
+            Convert.ToBoolean(random.Next(0, 2)),
+            Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), pictureBox1.Width, pictureBox1.Height);
+            _drawningCruiser.SetPosition(random.Next(10, 100),
+            random.Next(10, 100));
+            Draw();
+        }
+        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 Draw()
+        {
+            if (_drawningCruiser == null)
+            {
+                return;
+            }
+            Bitmap bmp = new(pictureBox1.Width,
+            pictureBox1.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _drawningCruiser.DrawTransport(gr);
+            pictureBox1.Image = bmp;
+        }
+       
+#endregion
+
+private Button button1;
+        private PictureBox pictureBox1;
+        private Button buttonDown;
+        private Button buttonLeft;
+        private Button buttonRight;
+        private Button buttonUp;
+        private Button buttonCreate;
+    }
+}

Cruiser/Cruiser/Form1.cs

@@ -0,0 +1,19 @@
+using System.Windows.Forms;
+
+namespace Cruiser
+{
+
+    public partial class CruiserForm : Form
+    {
+        private DrawningCruiser? _drawningCruiser;
+        public CruiserForm()
+        {
+            InitializeComponent();
+        }
+    }
+}
+
+
+
+
+

Cruiser/Cruiser/FormCarCollection.Designer.cs

@@ -0,0 +1,47 @@
+namespace Cruiser
+{
+    partial class FormCarCollection
+    {
+        /// <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.SuspendLayout();
+            // 
+            // FormCarCollection
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Name = "FormCarCollection";
+            this.Text = "FormCarCollection";
+            this.Load += new System.EventHandler(this.FormCarCollection_Load);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+    }
+}

Cruiser/Cruiser/FormCarCollection.cs

@@ -0,0 +1,95 @@
+using Cruiser.DrawningObjects;
+using Cruiser.Generics;
+using Cruiser.MovementStrategy;
+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 Cruiser.MovementStrategy;
+using Cruiser.DrawningObjects;
+using Cruiser.Generics;
+
+
+namespace DumpTruck
+{
+    public partial class FormCarCollection : Form
+    {
+        private readonly CarsGenericCollection<DrawningCruiser, DrawningObjectCar> _cars;
+
+        public FormCarCollection()
+        {
+            InitializeComponent();
+            _cars = new CarsGenericCollection<DrawningCruiser, DrawningObjectCar>(pictureBoxCollection.Width, pictureBoxCollection.Height);
+        }
+
+        private void Form2_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        private void pictureBoxCollection_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void ButtonAddCar_Click(object sender, EventArgs e)
+        {
+            FormDumpTruck form = new();
+
+
+            if (form.ShowDialog() == DialogResult.OK)
+            {
+                if (_cars + form.SelectedCar != null)
+                {
+                    MessageBox.Show("Объект добавлен");
+                    pictureBoxCollection.Image = _cars.ShowCars();
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось добавить объект");
+                }
+            }
+        }
+
+        private void ButtonRemoveCar_Click(object sender, EventArgs e)
+        {
+            if (MessageBox.Show("Удалить объект?", "Удаление",
+MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            int pos;
+            if (maskedTextBoxNumber.Text == null || !int.TryParse(maskedTextBoxNumber.Text, out pos))
+            {
+                MessageBox.Show("Введите номер парковочного места");
+                return;
+            }
+
+            if (_cars - pos != null)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBoxCollection.Image = _cars.ShowCars();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось удалить объект");
+            }
+
+        }
+
+        private void ButtonRefreshCollection_Click(object sender, EventArgs e)
+        {
+            pictureBoxCollection.Image = _cars.ShowCars();
+        }
+
+        private void maskedTextBoxNumber_MaskInputRejected(object sender, MaskInputRejectedEventArgs e)
+        {
+
+        }
+    }
+}

Cruiser/Cruiser/FormCruiserCollection.Designer.cs

@@ -1,111 +0,0 @@
-namespace Cruiser
-{
-    partial class FormCruiserCollection
-    {
-        private System.ComponentModel.IContainer components = null;
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-        private void InitializeComponent()
-        {
-            this.pictureBoxCruiser = new System.Windows.Forms.PictureBox();
-            this.panelCruiser = new System.Windows.Forms.Panel();
-            this.ButtonRemoveCruiser = new System.Windows.Forms.Button();
-            this.ButtonAddCruiser = new System.Windows.Forms.Button();
-            this.textBoxCruiser = new System.Windows.Forms.TextBox();
-            this.ButtonRefresh = new System.Windows.Forms.Button();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCruiser)).BeginInit();
-            this.panelCruiser.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // pictureBoxCruiser
-            // 
-            this.pictureBoxCruiser.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBoxCruiser.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxCruiser.Name = "pictureBoxCruiser";
-            this.pictureBoxCruiser.Size = new System.Drawing.Size(800, 450);
-            this.pictureBoxCruiser.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBoxCruiser.TabIndex = 0;
-            this.pictureBoxCruiser.TabStop = false;
-            // 
-            // panelCruiser
-            // 
-            this.panelCruiser.Controls.Add(this.ButtonRefresh);
-            this.panelCruiser.Controls.Add(this.ButtonRemoveCruiser);
-            this.panelCruiser.Controls.Add(this.ButtonAddCruiser);
-            this.panelCruiser.Controls.Add(this.textBoxCruiser);
-            this.panelCruiser.Location = new System.Drawing.Point(589, 12);
-            this.panelCruiser.Name = "panelCruiser";
-            this.panelCruiser.Size = new System.Drawing.Size(211, 438);
-            this.panelCruiser.TabIndex = 1;
-            // 
-            // ButtonRemoveCruiser
-            // 
-            this.ButtonRemoveCruiser.Location = new System.Drawing.Point(31, 168);
-            this.ButtonRemoveCruiser.Name = "ButtonRemoveCruiser";
-            this.ButtonRemoveCruiser.Size = new System.Drawing.Size(150, 34);
-            this.ButtonRemoveCruiser.TabIndex = 2;
-            this.ButtonRemoveCruiser.Text = "Удалить";
-            this.ButtonRemoveCruiser.UseVisualStyleBackColor = true;
-            this.ButtonRemoveCruiser.Click += new System.EventHandler(this.ButtonRemoveCruiser_Click);
-            // 
-            // ButtonAddCruiser
-            // 
-            this.ButtonAddCruiser.Location = new System.Drawing.Point(31, 37);
-            this.ButtonAddCruiser.Name = "ButtonAddCruiser";
-            this.ButtonAddCruiser.Size = new System.Drawing.Size(150, 34);
-            this.ButtonAddCruiser.TabIndex = 3;
-            this.ButtonAddCruiser.Text = "Добавить";
-            this.ButtonAddCruiser.UseVisualStyleBackColor = true;
-            this.ButtonAddCruiser.Click += new System.EventHandler(this.ButtonAddCruiser_Click);
-            // 
-            // textBoxCruiser
-            // 
-            this.textBoxCruiser.Location = new System.Drawing.Point(31, 104);
-            this.textBoxCruiser.Name = "textBoxCruiser";
-            this.textBoxCruiser.Size = new System.Drawing.Size(150, 31);
-            this.textBoxCruiser.TabIndex = 2;
-            // 
-            // ButtonRefresh
-            // 
-            this.ButtonRefresh.Location = new System.Drawing.Point(46, 324);
-            this.ButtonRefresh.Name = "ButtonRefresh";
-            this.ButtonRefresh.Size = new System.Drawing.Size(120, 31);
-            this.ButtonRefresh.TabIndex = 2;
-            this.ButtonRefresh.Text = "Обновить";
-            this.ButtonRefresh.UseVisualStyleBackColor = true;
-            this.ButtonRefresh.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(800, 450);
-            this.Controls.Add(this.panelCruiser);
-            this.Controls.Add(this.pictureBoxCruiser);
-            this.Name = "FormCruiserCollection";
-            this.Text = "FormCruiserCollection";
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCruiser)).EndInit();
-            this.panelCruiser.ResumeLayout(false);
-            this.panelCruiser.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-        #endregion
-
-        private PictureBox pictureBoxCruiser;
-        private Panel panelCruiser;
-        private Button ButtonRemoveCruiser;
-        private Button ButtonAddCruiser;
-        private TextBox textBoxCruiser;
-        private Button ButtonRefresh;
-    }
-}

Cruiser/Cruiser/FormCruiserCollection.cs

@@ -1,64 +0,0 @@
-using Cruiser.Generics;
-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 Cruiser.DrawningObjects;
-using Cruiser.MovementStrategy;
-
-namespace Cruiser
-{
-    public partial class FormCruiserCollection : Form
-    {
-        private readonly CruiserGenericCollection<DrawningCruiser, DrawningObjectCruiser> _cruiser;
-        public FormCruiserCollection()
-        {
-            InitializeComponent();
-            _cruiser = new CruiserGenericCollection<DrawningCruiser, DrawningObjectCruiser>(pictureBoxCruiser.Width, pictureBoxCruiser.Height);
-        }
-        private void ButtonAddCruiser_Click(object sender, EventArgs e)
-        {
-            CruiserForm form = new();
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                if (_cruiser + form.SelectedCruiser != -1)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBoxCruiser.Image = _cruiser.ShowCruisers();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
-            }
-        }
-        private void ButtonRemoveCruiser_Click(object sender, EventArgs e)
-        {
-            if (MessageBox.Show("Удалить объект?", "Удаление",
-        MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
-            {
-                return;
-            }
-            int pos = Convert.ToInt32(textBoxCruiser.Text);
-
-            if (_cruiser - pos != true)
-            {
-                MessageBox.Show("Объект удален");
-                pictureBoxCruiser.Image = _cruiser.ShowCruisers();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось удалить объект");
-            }
-        }
-        private void ButtonRefreshCollection_Click(object sender, EventArgs e)
-        {
-            pictureBoxCruiser.Image = _cruiser.ShowCruisers();
-        }
-    }
-}

Cruiser/Cruiser/IMoveableObject.cs

@@ -3,15 +3,27 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Cruiser.MovementStrategy;
 
 namespace Cruiser.MovementStrategy
+
 {
     public interface IMoveableObject
     {
         ObjectParameters? GetObjectPosition { get; }
+        /// <summary>
+        /// Шаг объекта
+        /// </summary>
         int GetStep { get; }
+        /// <summary>
+        /// Проверка, можно ли переместиться по нужному направлению
+        /// </summary>
+        /// <param name="direction"></param>
+        /// <returns></returns>
         bool CheckCanMove(Direction direction);
+        /// <summary>
+        /// Изменение направления пермещения объекта
+        /// </summary>
+        /// <param name="direction">Направление</param>
         void MoveObject(Direction direction);
     }
-}
+}

Cruiser/Cruiser/MoveToBorder.cs

@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Cruiser.MovementStrategy
-{
-    internal class MoveToBorder : AbstractStrategy
-    {
-        protected override bool IsTargetDestinaion()
-        {
-            var objParams = GetObjectParameters;
-            if (objParams == null)
-            {
-                return false;
-            }
-            return objParams.RightBorder <= FieldWidth &&
-            objParams.RightBorder + GetStep() >= FieldWidth &&
-            objParams.DownBorder <= FieldHeight &&
-            objParams.DownBorder + GetStep() >= FieldHeight;
-        }
-        protected override void MoveToTarget()
-        {
-            var objParams = GetObjectParameters;
-            if (objParams == null)
-            {
-                return;
-            }
-            var diffX = objParams.RightBorder - FieldWidth;
-            if (Math.Abs(diffX) > GetStep())
-            {
-                if (diffX > 0)
-                {
-                    MoveLeft();
-                }
-                else
-                {
-                    MoveRight();
-                }
-            }
-            var diffY = objParams.DownBorder - FieldHeight;
-            if (Math.Abs(diffY) > GetStep())
-            {
-                if (diffY > 0)
-                {
-                    MoveUp();
-                }
-                else
-                {
-                    MoveDown();
-
-                }
-            }
-        }
-    }
-}

Cruiser/Cruiser/MoveToCenter.cs

@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Cruiser.MovementStrategy
-{
-    internal class MoveToCenter : AbstractStrategy
-    {
-        protected override bool IsTargetDestinaion()
-        {
-            var objParams = GetObjectParameters;
-            if (objParams == null)
-            {
-                return false;
-            }
-            return (objParams.ObjectMiddleHorizontal <= FieldWidth / 2 &&
-            objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
-            objParams.ObjectMiddleVertical <= FieldHeight / 2 &&
-            objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2);
-
-        }
-        protected override void MoveToTarget()
-        {
-            var objParams = GetObjectParameters;
-            if (objParams == null)
-            {
-                return;
-            }
-            var diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
-            if (Math.Abs(diffX) > GetStep())
-            {
-                if (diffX > 0)
-                {
-                    MoveLeft();
-                }
-                else
-                {
-                    MoveRight();
-                }
-            }
-            var diffY = objParams.ObjectMiddleVertical - FieldHeight / 2;
-            if (Math.Abs(diffY) > GetStep())
-            {
-                if (diffY > 0)
-                {
-                    MoveUp();
-                }
-                else
-                {
-                    MoveDown();
-                }
-            }
-        }
-    }
-}

Cruiser/Cruiser/ObjectParameters.cs

@@ -12,12 +12,37 @@ namespace Cruiser.MovementStrategy
         private readonly int _y;
         private readonly int _width;
         private readonly int _height;
+        /// <summary>
+        /// Левая граница
+        /// </summary>
         public int LeftBorder => _x;
+        /// <summary>
+        /// Верхняя граница
+        /// </summary>
         public int TopBorder => _y;
+        /// <summary>
+        /// Правая граница
+        /// </summary>
         public int RightBorder => _x + _width;
+        /// <summary>
+        /// Нижняя граница
+        /// </summary>
         public int DownBorder => _y + _height;
+        /// <summary>
+        /// Середина объекта
+        /// </summary>
         public int ObjectMiddleHorizontal => _x + _width / 2;
+        /// <summary>
+        /// Середина объекта
+        /// </summary>
         public int ObjectMiddleVertical => _y + _height / 2;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="x">Координата X</param>
+        /// <param name="y">Координата Y</param>
+        /// <param name="width">Ширина</param>
+        /// <param name="height">Высота</param>
         public ObjectParameters(int x, int y, int width, int height)
         {
             _x = x;
@@ -26,4 +51,4 @@ namespace Cruiser.MovementStrategy
             _height = height;
         }
     }
-}
+}

Cruiser/Cruiser/Pro.cs

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

Cruiser/Cruiser/Program.cs

@@ -11,7 +11,7 @@ namespace Cruiser
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormCruiserCollection());
+            Application.Run(new CruiserForm());
         }
     }
 }

Cruiser/Cruiser/SetGeneric.cs

@@ -4,64 +4,103 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Cruiser.Generics
+namespace CruiserGenerics
 {
     internal class SetGeneric<T>
+    
         where T : class
     {
+        /// <summary>
+        /// Массив объектов, которые храним
+        /// </summary>
         private readonly T?[] _places;
+        /// <summary>
+        /// Количество объектов в массиве
+        /// </summary>
         public int Count => _places.Length;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="count"></param>
+        /// 
         public int startPointer = 0;
         public SetGeneric(int count)
         {
             _places = new T?[count];
         }
-        public int Insert(T cruiser)
+        /// <summary>
+        /// Добавление объекта в набор
+        /// </summary>
+        /// <param name="car">Добавляемый автомобиль</param>
+        /// <returns></returns>
+        public T? Insert(T car)
         {
-            return Insert(cruiser, 0);
+            if (_places[Count - 1] != null)
+                return null;
+            return Insert(car, 0);
         }
-        public int Insert(T cruiser, int position)
+        /// <summary>
+        /// Добавление объекта в набор на конкретную позицию
+        /// </summary>
+        /// <param name="car">Добавляемый автомобиль</param>
+        /// <param name="position">Позиция</param>
+        /// <returns></returns>
+        public T? Insert(T car, int position)
         {
-            int nullIndex = -1, i;
-            if (position < 0 || position >= Count)
+            if (!(position >= 0 && position < Count))
+                return null;
+            if (_places[position] != null)
             {
-                return -1;
-            }
-            for (i = position; i < Count; i++)
-            {
-                if (_places[i] == null)
+                int indexEnd = position;
+                while (_places[indexEnd] != null)
                 {
-                    nullIndex = i;
-                    break;
+                    indexEnd++;
                 }
+                if (indexEnd == Count)
+                    return null;
+                for (int i = indexEnd + 1; i > position; i--)
+                {
+                    _places[i] = _places[i - 1];
+                }
+
             }
-            if (nullIndex < 0)
-            {
-                return -1;
-            }
-            for (i = nullIndex; i > position; i--)
-            {
-                _places[i] = _places[i - 1];
-            }
-            _places[position] = cruiser;
-            return position;
+            _places[position] = car;
+            return car;
         }
+        // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
+        // проверка, что после вставляемого элемента в массиве есть пустой элемент
+        // сдвиг всех объектов, находящихся справа от позиции до первого пустого элемента
+        // TODO вставка по позиции
+
+
+
+        /// <summary>
+        /// Удаление объекта из набора с конкретной позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
         public bool Remove(int position)
         {
-            if (position < 0 || position >= Count)
+            if (position < Count && position >= 0)
             {
-                return false;
+                _places[position] = null;
+                return true;
             }
-            _places[position] = null;
-            return true;
+            return false;
+
+
         }
+        /// <summary>
+        /// Получение объекта из набора по позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
         public T? Get(int position)
         {
-            if (position < 0 || position >= Count)
-            {
-                return null;
-            }
-            return _places[position];
+            if (position < Count && position >= 0) { return _places[position]; }
+            return null;
+
         }
     }
-}
+}
+