Merge pull request 'E.S. Ihonkina Lab work 03' (#3) from LabWork03 into LabWork02

Reviewed-on: http://student.git.athene.tech/k_ihnkn/PIbd-21_Ihonkina_E.S._MotorBoat._Base/pulls/3

MotorBoat/MotorBoat/AbstractMap.cs

@@ -0,0 +1,203 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+    internal abstract class AbstractMap
+    {
+        private IDrawningObject _drawningObject = null;
+        protected int[,] _map = null;
+        protected int _width;
+        protected int _height;
+        protected float _size_x;
+        protected float _size_y;
+        protected readonly Random _random = new();
+        protected readonly int _freeRoad = 0;
+        protected readonly int _barrier = 1;
+        public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject)
+        {
+            _width = width;
+            _height = height;
+            _drawningObject = drawningObject;
+            GenerateMap();
+            while (!SetObjectOnMap())
+            {
+                GenerateMap();
+            }
+            return DrawMapWithObject();
+        }
+        public Bitmap MoveObject(Direction direction)
+        {
+            // TODO проверка, что объект может переместится в требуемом направлении
+            (float leftX, float topY, float rightX, float bottomY) = _drawningObject.GetCurrentPosition();
+            bool can = true;
+            //координаты в системе массива
+            int topYinS = Convert.ToInt32((topY) / _size_y);
+            int rightXinS = Convert.ToInt32((rightX) / _size_x);
+            int leftXinS = Convert.ToInt32((leftX) / _size_x);
+            int bottomYinS = Convert.ToInt32(bottomY / _size_y);
+
+            int stepinS = 0; 
+
+            switch (direction)
+            {
+                case Direction.Up:
+                    stepinS = Convert.ToInt32((topY - _drawningObject.Step) / _size_y);
+                    if (stepinS < 0) stepinS = 0;
+                    if (stepinS != topYinS)
+                    {
+                        for (int j = topYinS; j > stepinS; j--)
+                        {
+                            for (int i = leftXinS; i < rightXinS; i++)
+                            {
+                                if (_map[i, j] == _barrier)
+                                {
+                                    can = false;
+                                }
+                            }
+                        }
+                        if (!can)
+                        {
+                            return DrawMapWithObject();
+                        }
+                        _drawningObject.MoveObject(direction);
+                    }
+                    return DrawMapWithObject();
+
+                case Direction.Down:
+                    stepinS = Convert.ToInt32((bottomY + _drawningObject.Step) / _size_y);
+                    if (stepinS > _height) stepinS = _height;
+                    if (stepinS != topYinS)
+                    {
+                        for (int j = topYinS; j < stepinS; j++)
+                        {
+                            for (int i = leftXinS; i < rightXinS; i++)
+                            {
+                                if (_map[i, j] == _barrier)
+                                {
+                                    can = false;
+                                }
+                            }
+                        }
+                        if (!can)
+                        {
+                            return DrawMapWithObject();
+                        }
+                        _drawningObject.MoveObject(direction);
+                    }
+                    return DrawMapWithObject();
+
+                case Direction.Left:
+                    stepinS = Convert.ToInt32((leftX - _drawningObject.Step) / _size_x);
+                    if (stepinS < 0) stepinS = 0;
+                    if (stepinS != leftXinS)
+                    {
+                        for (int j = topYinS; j < bottomYinS; j++)
+                        {
+                            for (int i = leftXinS; i > stepinS; i--)
+                            {
+                                if (_map[i, j] == _barrier)
+                                {
+                                    can = false;
+                                }
+                            }
+                        }
+                        if (!can)
+                        {
+                            return DrawMapWithObject();
+                        }
+                        _drawningObject.MoveObject(direction);
+                    }
+                    return DrawMapWithObject();
+
+                case Direction.Right:
+                    stepinS = Convert.ToInt32((rightX + _drawningObject.Step) / _size_x);
+                    if (stepinS > _width) stepinS = _width;
+                    if (stepinS != leftXinS)
+                    {
+                        for (int j = topYinS; j < bottomYinS; j++)
+                        {
+                            for (int i = rightXinS; i < stepinS; i++)
+                            {
+                                if (_map[i, j] == _barrier)
+                                {
+                                    can = false;
+                                }
+                            }
+                        }
+                        if (!can)
+                        {
+                            return DrawMapWithObject();
+                        }
+                        _drawningObject.MoveObject(direction);
+                    }
+                    return DrawMapWithObject();
+            }
+            return DrawMapWithObject();
+        }
+        private bool SetObjectOnMap()
+        {
+           if (_drawningObject == null || _map == null)
+            {
+                return false;
+            }
+            int x = _random.Next(0, 10);
+            int y = _random.Next(0, 10);
+            _drawningObject.SetObject(x, y, _width, _height);
+            // TODO првоерка, что объект не "накладывается" на закрытые участки
+            (float leftX, float topY, float rightX, float bottomY) = _drawningObject.GetCurrentPosition();
+            //координаты лодки в "клетках" массива карты
+            int topYinS = Convert.ToInt32(topY / _size_y);
+            int rightXinS = Convert.ToInt32(rightX / _size_x);
+            int leftXinS = Convert.ToInt32(leftX / _size_x);
+            int bottomYinS = Convert.ToInt32(bottomY / _size_y);
+            
+            if (leftXinS < 0 || bottomYinS > _height || topYinS<0 || rightX > _width) {  return false; }
+
+            for (int j = topYinS; j <= bottomYinS; j++)
+            {
+                for (int i = leftXinS; i <= rightXinS; i++)
+                {
+                    if (_map[i, j] == _barrier)
+                    {
+                        return false;
+                    }
+                }
+            }
+
+            return true;
+        }
+        private Bitmap DrawMapWithObject()
+        {
+            Bitmap bmp = new(_width, _height);
+            if (_drawningObject == null || _map == null)
+            {
+                return bmp;
+            }
+            Graphics gr = Graphics.FromImage(bmp);
+            for (int i = 0; i < _map.GetLength(0); ++i)
+            {
+                for (int j = 0; j < _map.GetLength(1); ++j)
+                {
+                    if (_map[i, j] == _freeRoad)
+                    {
+                        DrawRoadPart(gr, i, j);
+                    }
+                    else if (_map[i, j] == _barrier)
+                    {
+                        DrawBarrierPart(gr, i, j);
+                    }
+                }
+            }
+            _drawningObject.DrawningObject(gr);
+            return bmp;
+        }
+
+        protected abstract void GenerateMap();
+        protected abstract void DrawRoadPart(Graphics g, int i, int j);
+        protected abstract void DrawBarrierPart(Graphics g, int i, int j);
+    }
+}

MotorBoat/MotorBoat/Direction.cs

@@ -6,11 +6,12 @@ using System.Threading.Tasks;
 
 namespace MotorBoat
 {
-    internal enum Direction
+    public enum Direction
     {
+        None = 0,
         Up = 1,
         Down = 2,
         Left = 3,
-        Right = 4
+        Right = 4,
     }
 }

MotorBoat/MotorBoat/DrawningBoat.cs

@@ -0,0 +1,132 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+    public class DrawningBoat
+    {
+        public EntityBoat Boat { get; protected set; }
+
+        protected float _startPosX;
+        protected float _startPosY;
+
+        private int? _pictureWidth = null;
+        private int? _pictureHeight = null;
+
+        private readonly int _boatWidth = 70;
+        private readonly int _boatHeight = 40;
+        public DrawningBoat(int speed, float weight, Color bodyColor)
+        {
+            Boat = new EntityBoat(speed, weight, bodyColor);
+        }
+        protected DrawningBoat(int speed, float weight, Color bodyColor, int boatWidth, int boatHeight) :
+            this(speed, weight, bodyColor)
+        {
+            _boatWidth = boatWidth;
+            _boatHeight = boatHeight;
+        }
+        public void SetPosition(int x, int y, int width, int height)
+        {
+            // TODO checks
+            _startPosX = x;
+            _startPosY = y;
+            _pictureWidth = width;
+            _pictureHeight = height;
+            if (_startPosX + _boatWidth > _pictureWidth) { _startPosX = 10; }
+            if (_startPosY - _boatHeight < 0) { _startPosY = _boatHeight + 10; }
+            if (_startPosY + _boatHeight > _pictureHeight) { _startPosY -= _boatHeight; }
+        }
+        public void MoveTransport(Direction direction)
+        {
+            if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
+            {
+                return;
+            }
+            switch (direction)
+            {
+                // вправо
+                case Direction.Right:
+                    if (_startPosX + _boatWidth + Boat.Step < _pictureWidth)
+                    {
+                        _startPosX += Boat.Step;
+                    }
+                    break;
+                //влево
+                case Direction.Left:
+                    if (_startPosX - Boat.Step > 0)
+                    {
+                        _startPosX -= Boat.Step;
+                    }
+                    break;
+                //вверх
+                case Direction.Up:
+                    if (_startPosY - _boatHeight - Boat.Step > 0)
+                    {
+                        _startPosY -= Boat.Step;
+                    }
+                    break;
+                //вниз
+                case Direction.Down:
+                    if (_startPosY + _boatHeight + Boat.Step < _pictureHeight)
+                    {
+                        _startPosY += Boat.Step;
+                    }
+                    break;
+            }
+        }
+        public virtual void DrawTransport(Graphics g)
+        {
+            if (_startPosX < 0 || _startPosY < 0
+                || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
+            {
+                return;
+            }
+            Pen pen = new Pen(Color.Black);
+            //границы лодки
+            Point[] points = new Point[5]
+            {
+                new Point(Convert.ToInt32(_startPosX),Convert.ToInt32(_startPosY)),
+            new Point(Convert.ToInt32(_startPosX + 50),Convert.ToInt32(_startPosY)),
+            new Point(Convert.ToInt32(_startPosX + 70),Convert.ToInt32(_startPosY - 20)),
+            new Point(Convert.ToInt32(_startPosX + 50),Convert.ToInt32(_startPosY - 40)),
+            new Point(Convert.ToInt32(_startPosX),Convert.ToInt32(_startPosY-40)),
+            };
+
+            Brush brBody = new SolidBrush(Boat?.BodyColor ?? Color.Black);
+            g.FillPolygon(brBody, points);
+            g.DrawPolygon(pen, points);
+                        
+            Brush brYellow = new SolidBrush(Color.Yellow);
+            g.FillEllipse(brYellow, _startPosX + 5, _startPosY - 30, 50, 20);
+            g.DrawEllipse(pen, _startPosX + 5, _startPosY - 30, 50, 20);
+
+        }
+        public void ChangeBorders(int width, int height)
+        {
+            _pictureWidth = width;
+            _pictureHeight = height;
+            if (_pictureWidth <= _boatWidth || _pictureHeight <= _boatHeight)
+            {
+                _pictureWidth = null;
+                _pictureHeight = null;
+                return;
+            }
+            if (_startPosX + _boatWidth > _pictureWidth)
+            {
+                _startPosX = _pictureWidth.Value - _boatWidth;
+            }
+            if (_startPosY + _boatHeight > _pictureHeight)
+            {
+                _startPosY = _pictureHeight.Value - _boatHeight;
+            }
+        }
+        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+        {
+            return (_startPosX, _startPosY, _startPosX + _boatWidth, _startPosY + _boatHeight);
+        }
+    }
+}

MotorBoat/MotorBoat/DrawningMotorBoat.cs

@@ -1,123 +1,95 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace MotorBoat
 {
-    class DrawningMotorBoat
+    internal class DrawningMotorBoat : DrawningBoat
     {
-        public EntityMotorBoat Boat { get; private set; }
-
-        private float _startPosX;
-        private float _startPosY;
-
-        private int? _pictureWidth = null;
-        private int? _pictureHeight = null;
-
-        private readonly int _boatWidth = 70;
-        private readonly int _boatHeight = 40;
-        public void Init(int speed, float weight, Color bodyColor)
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес автомобиля</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        /// <param name="dopColor">Дополнительный цвет</param>
+        /// <param name="bodyKit">Признак наличия обвеса</param>
+        /// <param name="wing">Признак наличия антикрыла</param>
+        /// <param name="sportLine">Признак наличия гоночной полосы</param>
+        public DrawningMotorBoat(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) :
+            base(speed, weight, bodyColor, 110, 60)
         {
-            Boat = new EntityMotorBoat();
-            Boat.Init(speed, weight, bodyColor);
+            Boat = new EntityMotorBoat(speed, weight, bodyColor, dopColor, bodyKit, wing, sportLine);
         }
-        public void SetPosition(int x, int y, int width, int height)
+        public override void DrawTransport(Graphics g)
         {
-            // TODO checks
-            _startPosX = x;
-            _startPosY = y;
-            _pictureWidth = width;
-            _pictureHeight = height;
-            if (_startPosX + _boatWidth > _pictureWidth) { _startPosX = 10; }
-            if (_startPosY - _boatHeight < 0) { _startPosY = _boatHeight + 10; }
-            if (_startPosY + _boatHeight > _pictureHeight) { _startPosY -= _boatHeight; }
-        }
-        public void MoveBoats(Direction direction)
-        {
-            if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
+            if (Boat is not EntityMotorBoat motorBoat)
             {
                 return;
             }
-            switch (direction)
-            {
-                // вправо
-                case Direction.Right:
-                    if (_startPosX + _boatWidth + Boat.Step < _pictureWidth)
-                    {
-                        _startPosX += Boat.Step;
-                    }
-                    break;
-                //влево
-                case Direction.Left:
-                    if (_startPosX - Boat.Step > 0)
-                    {
-                        _startPosX -= Boat.Step;
-                    }
-                    break;
-                //вверх
-                case Direction.Up:
-                    if (_startPosY - _boatHeight - Boat.Step > 0)
-                    {
-                        _startPosY -= Boat.Step;
-                    }
-                    break;
-                //вниз
-                case Direction.Down:
-                    if (_startPosY + _boatHeight + Boat.Step < _pictureHeight)
-                    {
-                        _startPosY += Boat.Step;
-                    }
-                    break;
-            }
-        }
-        public void DrawTransport(Graphics g)
-        {
-            if (_startPosX < 0 || _startPosY < 0
-                || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
-            {
-                return;
-            }
-            Pen pen = new Pen(Color.Black);
-            //границы лодки
-            Point[] points = new Point[5]
-            {
-                new Point(Convert.ToInt32(_startPosX),Convert.ToInt32(_startPosY)),
-            new Point(Convert.ToInt32(_startPosX + 50),Convert.ToInt32(_startPosY)),
-            new Point(Convert.ToInt32(_startPosX + 70),Convert.ToInt32(_startPosY - 20)),
-            new Point(Convert.ToInt32(_startPosX + 50),Convert.ToInt32(_startPosY - 40)),
-            new Point(Convert.ToInt32(_startPosX),Convert.ToInt32(_startPosY-40)),
-            };
+            Point[] points;
+            Pen pen = new(Color.Black);
+            Brush dopBrush = new SolidBrush(motorBoat.DopColor);
+                       
+            g.FillEllipse(new SolidBrush(Color.Black), _startPosX - 17, _startPosY - 24, 14, 5);
+            g.FillEllipse(new SolidBrush(Color.Black), _startPosX - 17, _startPosY - 21, 14, 5);
 
+            g.FillRectangle(dopBrush, _startPosX - 10, _startPosY - 30, 10, 20);
+            g.DrawRectangle(pen, _startPosX - 10, _startPosY - 30, 10, 20);
+
+            if (motorBoat.BodyKit)
+            {
+                points = new Point[]
+                {
+                    new Point(Convert.ToInt32(_startPosX),Convert.ToInt32(_startPosY-50)),
+                    new Point(Convert.ToInt32(_startPosX),Convert.ToInt32(_startPosY+10)),
+                    new Point(Convert.ToInt32(_startPosX+50),Convert.ToInt32(_startPosY)),
+                    new Point(Convert.ToInt32(_startPosX+50),Convert.ToInt32(_startPosY-40)),
+                };
+                g.FillPolygon(dopBrush, points);
+                g.DrawPolygon(pen, points);
+            }
+
+            if (motorBoat.Wing)
+            {
+                points = new Point[]
+               {
+                    new Point(Convert.ToInt32(_startPosX)+50,Convert.ToInt32(_startPosY-40)),
+                    new Point(Convert.ToInt32(_startPosX)+80,Convert.ToInt32(_startPosY-20)),
+                    new Point(Convert.ToInt32(_startPosX+50),Convert.ToInt32(_startPosY)),
+               };
+                g.FillPolygon(dopBrush, points);
+                g.DrawPolygon(pen, points);
+            }
+
+            base.DrawTransport(g);
+            points = new Point[]
+               {
+                    new Point(Convert.ToInt32(_startPosX)+50,Convert.ToInt32(_startPosY-34)),
+                    new Point(Convert.ToInt32(_startPosX)+57,Convert.ToInt32(_startPosY-20)),
+                    new Point(Convert.ToInt32(_startPosX+50),Convert.ToInt32(_startPosY-6)),
+               };
+            g.FillPolygon(new SolidBrush(Color.LightBlue), points);
             g.DrawPolygon(pen, points);
-            Brush brBody = new SolidBrush(Boat?.BodyColor ?? Color.Black);
-            g.FillPolygon(brBody, points);
 
-            g.DrawEllipse(pen, _startPosX + 5, _startPosY - 30, 50, 20);
-            Brush brYellow = new SolidBrush(Color.Yellow);
-            g.FillEllipse(brYellow, _startPosX + 5, _startPosY - 30, 50, 20);
-
-        }
-        public void ChangeBorders(int width, int height)
-        {
-            _pictureWidth = width;
-            _pictureHeight = height;
-            if (_pictureWidth <= _boatWidth || _pictureHeight <= _boatHeight)
+            if (motorBoat.SportLine)
             {
-                _pictureWidth = null;
-                _pictureHeight = null;
-                return;
-            }
-            if (_startPosX + _boatWidth > _pictureWidth)
-            {
-                _startPosX = _pictureWidth.Value - _boatWidth;
-            }
-            if (_startPosY + _boatHeight > _pictureHeight)
-            {
-                _startPosY = _pictureHeight.Value - _boatHeight;
-            }
-        }
+                points = new Point[]
+                {
+                    new Point(Convert.ToInt32(_startPosX)+5,Convert.ToInt32(_startPosY-37)),
+                    new Point(Convert.ToInt32(_startPosX)+5,Convert.ToInt32(_startPosY-30)),
+                    new Point(Convert.ToInt32(_startPosX+35),Convert.ToInt32(_startPosY-37)),
+                };
+                g.FillPolygon(dopBrush, points);
+                g.DrawPolygon(pen, points);
+                points = new Point[]
+                {
+                    new Point(Convert.ToInt32(_startPosX)+5,Convert.ToInt32(_startPosY-3)),
+                    new Point(Convert.ToInt32(_startPosX)+5,Convert.ToInt32(_startPosY-10)),
+                    new Point(Convert.ToInt32(_startPosX+35),Convert.ToInt32(_startPosY-3)),
+                };
+                g.FillPolygon(dopBrush, points);
+                g.DrawPolygon(pen, points);
+            }              
+        }    
     }
 }

MotorBoat/MotorBoat/DrawningObjectBoat.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+    internal class DrawningObjectBoat : IDrawningObject
+    {
+        private DrawningBoat _boat = null;
+        public DrawningObjectBoat(DrawningBoat boat)
+        {
+            _boat = boat;
+        }
+        public float Step => _boat?.Boat?.Step ?? 0;
+        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+        {
+            return _boat?.GetCurrentPosition() ?? default;
+        }
+        public void MoveObject(Direction direction)
+        {
+            _boat?.MoveTransport(direction);
+        }
+        public void SetObject(int x, int y, int width, int height)
+        {
+            _boat.SetPosition(x, y, width, height);
+        }
+        void IDrawningObject.DrawningObject(Graphics g)
+        {
+            _boat.DrawTransport(g);
+        }
+    }
+}

MotorBoat/MotorBoat/EntityBoat.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+    public class EntityBoat
+    {
+        public int Speed { get; private set; }
+        public float Weight { get; private set; }
+        public Color BodyColor { get; private set; }
+        public float Step => Speed * 100 / Weight;
+        public EntityBoat(int speed, float weight, Color bodyColor)
+        {
+            Random rnd = new Random();
+            Speed = speed <= 0 ? rnd.Next(50, 150) : speed;
+            Weight = weight <= 0 ? rnd.Next(40, 70) : weight;
+            BodyColor = bodyColor;
+        }
+    }
+}

MotorBoat/MotorBoat/EntityMotorBoat.cs

@@ -1,24 +1,31 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace MotorBoat
 {
-    class EntityMotorBoat
+    internal class EntityMotorBoat : EntityBoat
     {
-        public int Speed { get; private set; }
-        public float Weight { get; private set; }
-        public Color BodyColor { get; private set; }
-        public float Step => Speed * 100 / Weight;
-        public void Init(int speed, float weight, Color bodyColor)
+        public Color DopColor { get; private set; }
+        public bool BodyKit { get; private set; }
+        public bool Wing { get; private set; }
+        public bool SportLine { get; private set; }
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес лодки</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        /// <param name="dopColor">Дополнительный цвет</param>
+        /// <param name="bodyKit">Признак наличия обвеса</param>
+        /// <param name="wing">Признак наличия антикрыла</param>
+        /// <param name="sportLine">Признак наличия гоночной полосы</param>
+        public EntityMotorBoat(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) :
+           base(speed, weight, bodyColor)
         {
-            Random rnd = new Random();
-            Speed = speed <= 0 ? rnd.Next(50, 150) : speed;
-            Weight = weight <= 0 ? rnd.Next(40, 70) : weight;
-            BodyColor = bodyColor;
+            DopColor = dopColor;
+            BodyKit = bodyKit;
+            Wing = wing;
+            SportLine = sportLine;
         }
     }
 }

MotorBoat/MotorBoat/FormBoat.Designer.cs

@@ -1,6 +1,6 @@
 namespace MotorBoat
 {
-    partial class FormMotorBoat
+    partial class FormBoat
     {
         /// <summary>
         ///  Required designer variable.
@@ -38,6 +38,8 @@
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonCreate = new System.Windows.Forms.Button();
+            this.buttonCreateModif = new System.Windows.Forms.Button();
+            this.buttonSelectBoat = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxMotorBoat)).BeginInit();
             this.statusStrip1.SuspendLayout();
             this.SuspendLayout();
@@ -141,11 +143,35 @@
             this.buttonCreate.UseVisualStyleBackColor = true;
             this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click);
             // 
-            // FormMotorBoat
+            // buttonCreateModif
+            // 
+            this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.buttonCreateModif.Location = new System.Drawing.Point(133, 369);
+            this.buttonCreateModif.Name = "buttonCreateModif";
+            this.buttonCreateModif.Size = new System.Drawing.Size(111, 44);
+            this.buttonCreateModif.TabIndex = 6;
+            this.buttonCreateModif.Text = "Модификация";
+            this.buttonCreateModif.UseVisualStyleBackColor = true;
+            this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click);
+            // 
+            // buttonSelectBoat
+            // 
+            this.buttonSelectBoat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.buttonSelectBoat.Location = new System.Drawing.Point(487, 366);
+            this.buttonSelectBoat.Name = "buttonSelectBoat";
+            this.buttonSelectBoat.Size = new System.Drawing.Size(111, 44);
+            this.buttonSelectBoat.TabIndex = 7;
+            this.buttonSelectBoat.Text = "Выбрать";
+            this.buttonSelectBoat.UseVisualStyleBackColor = true;
+            this.buttonSelectBoat.Click += new System.EventHandler(this.buttonSelectBoat_Click);
+            // 
+            // FormBoat
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.buttonSelectBoat);
+            this.Controls.Add(this.buttonCreateModif);
             this.Controls.Add(this.buttonCreate);
             this.Controls.Add(this.buttonDown);
             this.Controls.Add(this.buttonLeft);
@@ -153,7 +179,7 @@
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.pictureBoxMotorBoat);
             this.Controls.Add(this.statusStrip1);
-            this.Name = "FormMotorBoat";
+            this.Name = "FormBoat";
             this.Text = "Моторная лодка";
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxMotorBoat)).EndInit();
             this.statusStrip1.ResumeLayout(false);
@@ -175,5 +201,7 @@
         private Button buttonLeft;
         private Button buttonDown;
         private Button buttonCreate;
+        private Button buttonCreateModif;
+        private Button buttonSelectBoat;
     }
 }

MotorBoat/MotorBoat/FormBoat.cs

@@ -0,0 +1,112 @@
+using System;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace MotorBoat
+{
+    public partial class FormBoat : Form
+    {
+        private DrawningBoat _boat;
+        public DrawningBoat SelectedBoat { get; private set; }
+        public FormBoat()
+        {
+            InitializeComponent();
+        }
+        private void ButtonCreate_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256),
+           rnd.Next(0, 256));
+            ColorDialog dialog = new();
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                color = dialog.Color;
+            }
+            _boat = new DrawningBoat(rnd.Next(100, 300), rnd.Next(1000, 2000),
+           color);
+            SetData();
+            Draw();
+
+        }
+        private void Draw()
+        {
+            Bitmap bmp = new Bitmap(pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _boat?.DrawTransport(gr);
+            pictureBoxMotorBoat.Image = bmp;
+        }
+        private void SetData()
+        {
+            Random rnd = new();
+            _boat.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
+            toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_boat.Boat.Speed}";
+            toolStripStatusLabelWeight.Text = $"Âåñ: {_boat.Boat.Weight}";
+            toolStripStatusLabelBodyColor.Text = $"Öâåò: {_boat.Boat.BodyColor.Name}";
+        }
+        private void PictureBoxCar_Resize(object sender, EventArgs e)
+        {
+            _boat?.ChangeBorders(pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
+            Draw();
+        }
+
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            //ïîëó÷àåì èìÿ êíîïêè
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            switch (name)
+            {
+                case "buttonUp":
+                    _boat?.MoveTransport(Direction.Up);
+                    break;
+                case "buttonDown":
+                    _boat?.MoveTransport(Direction.Down);
+                    break;
+                case "buttonLeft":
+                    _boat?.MoveTransport(Direction.Left);
+                    break;
+                case "buttonRight":
+                    _boat?.MoveTransport(Direction.Right);
+                    break;
+            }
+            Draw();
+        }
+        /// Îáðàáîòêà íàæàòèÿ êíîïêè "Ìîäèôèêàöèÿ"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonCreateModif_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256),
+           rnd.Next(0, 256));
+            ColorDialog dialog = new();
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                color = dialog.Color;
+            }
+            Color dopColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256),
+           rnd.Next(0, 256));
+            ColorDialog dialogDop = new();
+            if (dialogDop.ShowDialog() == DialogResult.OK)
+            {
+                dopColor = dialogDop.Color;
+            }
+            _boat = new DrawningMotorBoat(rnd.Next(100, 300), rnd.Next(1000, 2000),
+           color, dopColor,
+            Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0,
+           2)), Convert.ToBoolean(rnd.Next(0, 2)));
+            SetData();
+            Draw();
+        }
+
+        private void buttonSelectBoat_Click(object sender, EventArgs e)
+        {
+            SelectedBoat = _boat;
+            DialogResult = DialogResult.OK;
+        }
+    }
+}

MotorBoat/MotorBoat/FormMapWithSetBoats.Designer.cs

@@ -0,0 +1,218 @@
+namespace MotorBoat
+{
+    partial class FormMapWithSetBoats
+    {
+        /// <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.groupBoxTools = new System.Windows.Forms.GroupBox();
+            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
+            this.buttonRemoveBoat = new System.Windows.Forms.Button();
+            this.buttonShowStorage = new System.Windows.Forms.Button();
+            this.buttonDown = new System.Windows.Forms.Button();
+            this.buttonRight = new System.Windows.Forms.Button();
+            this.buttonLeft = new System.Windows.Forms.Button();
+            this.buttonUp = new System.Windows.Forms.Button();
+            this.buttonShowOnMap = new System.Windows.Forms.Button();
+            this.buttonAddBoat = new System.Windows.Forms.Button();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            this.pictureBox = new System.Windows.Forms.PictureBox();
+            this.groupBoxTools.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // groupBoxTools
+            // 
+            this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
+            this.groupBoxTools.Controls.Add(this.buttonRemoveBoat);
+            this.groupBoxTools.Controls.Add(this.buttonShowStorage);
+            this.groupBoxTools.Controls.Add(this.buttonDown);
+            this.groupBoxTools.Controls.Add(this.buttonRight);
+            this.groupBoxTools.Controls.Add(this.buttonLeft);
+            this.groupBoxTools.Controls.Add(this.buttonUp);
+            this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
+            this.groupBoxTools.Controls.Add(this.buttonAddBoat);
+            this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap);
+            this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
+            this.groupBoxTools.Location = new System.Drawing.Point(738, 0);
+            this.groupBoxTools.Name = "groupBoxTools";
+            this.groupBoxTools.Size = new System.Drawing.Size(251, 561);
+            this.groupBoxTools.TabIndex = 0;
+            this.groupBoxTools.TabStop = false;
+            this.groupBoxTools.Text = "Инструменты";
+            // 
+            // maskedTextBoxPosition
+            // 
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(38, 174);
+            this.maskedTextBoxPosition.Mask = "00";
+            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            this.maskedTextBoxPosition.Size = new System.Drawing.Size(175, 23);
+            this.maskedTextBoxPosition.TabIndex = 13;
+            this.maskedTextBoxPosition.ValidatingType = typeof(int);
+            // 
+            // buttonRemoveBoat
+            // 
+            this.buttonRemoveBoat.Location = new System.Drawing.Point(38, 203);
+            this.buttonRemoveBoat.Name = "buttonRemoveBoat";
+            this.buttonRemoveBoat.Size = new System.Drawing.Size(175, 35);
+            this.buttonRemoveBoat.TabIndex = 14;
+            this.buttonRemoveBoat.Text = "Удалить лодку";
+            this.buttonRemoveBoat.UseVisualStyleBackColor = true;
+            this.buttonRemoveBoat.Click += new System.EventHandler(this.ButtonRemoveBoat_Click);
+            // 
+            // buttonShowStorage
+            // 
+            this.buttonShowStorage.Location = new System.Drawing.Point(38, 298);
+            this.buttonShowStorage.Name = "buttonShowStorage";
+            this.buttonShowStorage.Size = new System.Drawing.Size(175, 35);
+            this.buttonShowStorage.TabIndex = 15;
+            this.buttonShowStorage.Text = "Посмотреть хранилище";
+            this.buttonShowStorage.UseVisualStyleBackColor = true;
+            this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
+            // 
+            // buttonDown
+            // 
+            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonDown.BackgroundImage = global::MotorBoat.Properties.Resources.d;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonDown.Location = new System.Drawing.Point(112, 469);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(30, 30);
+            this.buttonDown.TabIndex = 20;
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.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::MotorBoat.Properties.Resources.up;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonRight.Location = new System.Drawing.Point(148, 469);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(30, 30);
+            this.buttonRight.TabIndex = 19;
+            this.buttonRight.UseVisualStyleBackColor = true;
+            this.buttonRight.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::MotorBoat.Properties.Resources.left;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(76, 469);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
+            this.buttonLeft.TabIndex = 18;
+            this.buttonLeft.UseVisualStyleBackColor = true;
+            this.buttonLeft.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::MotorBoat.Properties.Resources.r;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUp.Location = new System.Drawing.Point(112, 433);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(30, 30);
+            this.buttonUp.TabIndex = 17;
+            this.buttonUp.UseVisualStyleBackColor = true;
+            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonShowOnMap
+            // 
+            this.buttonShowOnMap.Location = new System.Drawing.Point(38, 377);
+            this.buttonShowOnMap.Name = "buttonShowOnMap";
+            this.buttonShowOnMap.Size = new System.Drawing.Size(175, 35);
+            this.buttonShowOnMap.TabIndex = 16;
+            this.buttonShowOnMap.Text = "Посмотреть карту";
+            this.buttonShowOnMap.UseVisualStyleBackColor = true;
+            this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
+            // 
+            // buttonAddBoat
+            // 
+            this.buttonAddBoat.Location = new System.Drawing.Point(38, 115);
+            this.buttonAddBoat.Name = "buttonAddBoat";
+            this.buttonAddBoat.Size = new System.Drawing.Size(175, 35);
+            this.buttonAddBoat.TabIndex = 12;
+            this.buttonAddBoat.Text = "Добавить лодку";
+            this.buttonAddBoat.UseVisualStyleBackColor = true;
+            this.buttonAddBoat.Click += new System.EventHandler(this.ButtonAddBoat_Click);
+            // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxSelectorMap.FormattingEnabled = true;
+            this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Розовая карта",
+            "Морская карта"});
+            this.comboBoxSelectorMap.Location = new System.Drawing.Point(38, 44);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(175, 23);
+            this.comboBoxSelectorMap.TabIndex = 11;
+            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
+            // 
+            // pictureBox
+            // 
+            this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pictureBox.Location = new System.Drawing.Point(0, 0);
+            this.pictureBox.Name = "pictureBox";
+            this.pictureBox.Size = new System.Drawing.Size(738, 561);
+            this.pictureBox.TabIndex = 0;
+            this.pictureBox.TabStop = false;
+            // 
+            // FormMapWithSetBoats
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(989, 561);
+            this.Controls.Add(this.pictureBox);
+            this.Controls.Add(this.groupBoxTools);
+            this.Name = "FormMapWithSetBoats";
+            this.Text = "FormMapWithSetBoats";
+            this.groupBoxTools.ResumeLayout(false);
+            this.groupBoxTools.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private GroupBox groupBoxTools;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button buttonRemoveBoat;
+        private Button buttonShowStorage;
+        private Button buttonDown;
+        private Button buttonRight;
+        private Button buttonLeft;
+        private Button buttonUp;
+        private Button buttonShowOnMap;
+        private Button buttonAddBoat;
+        private ComboBox comboBoxSelectorMap;
+        private PictureBox pictureBox;
+    }
+}

MotorBoat/MotorBoat/FormMapWithSetBoats.cs

@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace MotorBoat
+{
+    public partial class FormMapWithSetBoats : Form
+    {
+        private MapWithSetBoatsGeneric<DrawningObjectBoat, AbstractMap> _mapBoatsCollectionGeneric;
+        public FormMapWithSetBoats()
+        {
+            InitializeComponent();
+        }
+        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            AbstractMap map = null;
+            switch (comboBoxSelectorMap.Text)
+            {
+                case "Простая карта":
+                    map = new SimpleMap();
+                    break;
+                case "Розовая карта":
+                    map = new PinkMap();
+                    break;
+                case "Морская карта":
+                    map = new SeaMap();
+                    break;
+            }
+            if (map != null)
+            {
+                _mapBoatsCollectionGeneric = new MapWithSetBoatsGeneric<DrawningObjectBoat, AbstractMap>(
+                    pictureBox.Width, pictureBox.Height, map);
+            }
+            else
+            {
+                _mapBoatsCollectionGeneric = null;
+            }
+        }
+        private void ButtonAddBoat_Click(object sender, EventArgs e)
+        {
+            if (_mapBoatsCollectionGeneric == null)
+            {
+                return;
+            }
+            FormBoat form = new();
+            if (form.ShowDialog() == DialogResult.OK)
+            {
+                DrawningObjectBoat boat = new(form.SelectedBoat);
+                if (_mapBoatsCollectionGeneric + boat != -1)
+                {
+                    MessageBox.Show("Объект добавлен");
+                    pictureBox.Image = _mapBoatsCollectionGeneric.ShowSet();
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось добавить объект");
+                }
+            }
+        }
+        private void ButtonRemoveBoat_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
+            {
+                return;
+            }
+            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+            if (_mapBoatsCollectionGeneric - pos != null)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBox.Image = _mapBoatsCollectionGeneric.ShowSet();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось удалить объект");
+            }
+        }
+        private void ButtonShowStorage_Click(object sender, EventArgs e)
+        {
+            if (_mapBoatsCollectionGeneric == null)
+            {
+                return;
+            }
+            pictureBox.Image = _mapBoatsCollectionGeneric.ShowSet();
+        }
+        private void ButtonShowOnMap_Click(object sender, EventArgs e)
+        {
+            if (_mapBoatsCollectionGeneric == null)
+            {
+                return;
+            }
+            pictureBox.Image = _mapBoatsCollectionGeneric.ShowOnMap();
+        }
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            if (_mapBoatsCollectionGeneric == null)
+            {
+                return;
+            }
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            Direction dir = Direction.None;
+            switch (name)
+            {
+                case "buttonUp":
+                    dir = Direction.Up;
+                    break;
+                case "buttonDown":
+                    dir = Direction.Down;
+                    break;
+                case "buttonLeft":
+                    dir = Direction.Left;
+                    break;
+                case "buttonRight":
+                    dir = Direction.Right;
+                    break;
+            }
+            pictureBox.Image = _mapBoatsCollectionGeneric.MoveObject(dir);
+        }
+    }
+    
+}

MotorBoat/MotorBoat/FormMapWithSetBoats.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>

MotorBoat/MotorBoat/FormMotorBoat.cs

@@ -1,66 +0,0 @@
-using System;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace MotorBoat
-{
-    public partial class FormMotorBoat : Form
-    {
-        private DrawningMotorBoat _boat;
-        public FormMotorBoat()
-        {
-            InitializeComponent();
-        }
-
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
-            Random rnd = new Random();
-            _boat = new DrawningMotorBoat();
-            _boat.Init(rnd.Next(50, 150), rnd.Next(100, 200), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            _boat.SetPosition(rnd.Next(10, 100), rnd.Next(0,100), pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
-            toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_boat.Boat.Speed}";
-            toolStripStatusLabelWeight.Text = $"Âåñ: {_boat.Boat.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Öâåò: {_boat.Boat.BodyColor.Name}";
-            Draw();
-        }
-        private void Draw()
-        {
-            Bitmap bmp = new Bitmap(pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
-            Graphics gr = Graphics.FromImage(bmp);
-            _boat?.DrawTransport(gr);
-            pictureBoxMotorBoat.Image = bmp;
-        }
-       
-        private void PictureBoxCar_Resize(object sender, EventArgs e)
-        {
-            _boat?.ChangeBorders(pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
-            Draw();
-        }
-
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            //ïîëó÷àåì èìÿ êíîïêè
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            switch (name)
-            {
-                case "buttonUp":
-                    _boat?.MoveBoats(Direction.Up);
-                    break;
-                case "buttonDown":
-                    _boat?.MoveBoats(Direction.Down);
-                    break;
-                case "buttonLeft":
-                    _boat?.MoveBoats(Direction.Left);
-                    break;
-                case "buttonRight":
-                    _boat?.MoveBoats(Direction.Right);
-                    break;
-            }
-            Draw();
-        }
-    }
-}

MotorBoat/MotorBoat/IDrawningObject.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+	internal interface IDrawningObject
+	{
+		/// <summary>
+		/// Шаг перемещения объекта
+		/// </summary>
+		public float Step { get; }
+		/// <summary>
+		/// Установка позиции объекта
+		/// </summary>
+		/// <param name="x">Координата X</param>
+		/// <param name="y">Координата Y</param>
+		/// <param name="width">Ширина полотна</param>
+		/// <param name="height">Высота полотна</param>
+		void SetObject(int x, int y, int width, int height);
+		/// <summary>
+		/// Изменение направления пермещения объекта
+		/// </summary>
+		/// <param name="direction">Направление</param>
+		/// <returns></returns>
+		void MoveObject(Direction direction);
+		/// <summary>
+		/// Отрисовка объекта
+		/// </summary>
+		/// <param name="g"></param>
+		void DrawningObject(Graphics g);
+		/// <summary>
+		/// Получение текущей позиции объекта
+		/// </summary>
+		/// <returns></returns>
+		(float Left, float Right, float Top, float Bottom) GetCurrentPosition();
+	}
+}

MotorBoat/MotorBoat/MapWithSetBoatsGeneric.cs

@@ -0,0 +1,171 @@
+namespace MotorBoat
+{
+    /// Карта с набром объектов под нее
+    internal class MapWithSetBoatsGeneric<T, U>
+        where T : class, IDrawningObject
+        where U : AbstractMap
+    {
+        /// Ширина окна отрисовки
+        private readonly int _pictureWidth;
+        /// Высота окна отрисовки
+        private readonly int _pictureHeight;
+        /// Размер занимаемого объектом места (ширина)
+        private readonly int _placeSizeWidth = 210;
+        /// Размер занимаемого объектом места (высота)
+        private readonly int _placeSizeHeight = 70;
+        /// Набор объектов
+        private readonly SetBoatsGeneric<T> _setBoats;
+        /// Карта
+        private readonly U _map;
+        /// Конструктор
+        public MapWithSetBoatsGeneric(int picWidth, int picHeight, U map)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _setBoats = new SetBoatsGeneric<T>(width * height);
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _map = map;
+        }
+        /// Перегрузка оператора сложения
+        public static int operator +(MapWithSetBoatsGeneric<T, U> map, T boat)
+        {
+            return map._setBoats.Insert(boat);
+        }
+        /// Перегрузка оператора вычитания
+        public static T operator -(MapWithSetBoatsGeneric<T, U> map, int position)
+        {
+            return map._setBoats.Remove(position);
+        }
+        /// Вывод всего набора объектов
+        public Bitmap ShowSet()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawCars(gr);
+            return bmp;
+        }
+        /// Просмотр объекта на карте
+        public Bitmap ShowOnMap()
+        {
+            Shaking();
+            for (int i = 0; i < _setBoats.Count; i++)
+            {
+                var boat = _setBoats.Get(i);
+                if (boat != null)
+                {
+                    return _map.CreateMap(_pictureWidth, _pictureHeight, boat);
+                }
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+        /// Перемещение объекта по крате
+        public Bitmap MoveObject(Direction direction)
+        {
+            if (_map != null)
+            {
+                return _map.MoveObject(direction);
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+        /// "Взбалтываем" набор, чтобы все элементы оказались в начале
+        private void Shaking()
+        {
+            int j = _setBoats.Count - 1;
+            for (int i = 0; i < _setBoats.Count; i++)
+            {
+                if (_setBoats.Get(i) == null)
+                {
+                    for (; j > i; j--)
+                    {
+                        var car = _setBoats.Get(j);
+                        if (car != null)
+                        {
+                            _setBoats.Insert(car, i);
+                            _setBoats.Remove(j);
+                            break;
+                        }
+                    }
+                    if (j <= i)
+                    {
+                        return;
+                    }
+                }
+            }
+        }
+        /// Метод отрисовки фона
+        private void DrawBackground(Graphics g)
+        {
+            g.FillRectangle(new SolidBrush(Color.LightBlue), 0, 0, _pictureWidth, _pictureHeight);
+            Brush brGavan = new SolidBrush(Color.Gray);
+            Brush brGreen = new SolidBrush(Color.Khaki);
+            g.FillRectangle(brGreen, 0, 0, _pictureWidth, 30);
+            g.FillRectangle(brGreen, _pictureWidth - 30, 0, 30, _pictureHeight);
+
+            g.FillRectangle(brGavan, 30, 30, _pictureWidth - 60, 30);
+            g.FillRectangle(brGavan, _pictureWidth - 60, 30, 30, _pictureHeight - 60);
+            g.FillRectangle(brGavan, _pictureWidth / 2, 60, 60, _pictureHeight - 100);
+        }
+        /// Метод прорисовки объектов
+        private void DrawCars(Graphics g)
+        {
+            int curWidth = 50;
+            int curHeight = 60;
+            bool right = true;
+            bool down = false;
+            bool rightdown = false;
+
+            for (int i = 0; i < _setBoats.Count; i++)
+            {
+                if (right)
+                {
+                    _setBoats.Get(i)?.SetObject(curWidth, curHeight + _placeSizeHeight, _placeSizeWidth, _placeSizeHeight);
+                    g.RotateTransform(270, 0);
+                    g.TranslateTransform(-190, 0);
+                    _setBoats.Get(i)?.DrawningObject(g);
+                    g.TranslateTransform(190, 0);
+                    g.RotateTransform(-270, 0);
+
+                    if (curHeight > 300 && curHeight < 400)
+                    {
+                        curHeight += 80;
+                    }
+                    curHeight += _placeSizeHeight;
+
+                    if (curHeight >= _pictureWidth - 100)
+                    {
+                        right = false;
+                        down = true;
+                        g.TranslateTransform(_pictureWidth / 2 + _placeSizeWidth, 0);
+                        curWidth = 500;
+                        curHeight = 200;
+                    }
+                }
+                else if (down)
+                {
+                    if (rightdown)
+                    {
+                        rightdown = false;
+                        _setBoats.Get(i)?.SetObject(curWidth, curHeight + _placeSizeHeight, _placeSizeWidth, _placeSizeHeight);
+                        g.TranslateTransform(_placeSizeWidth + 90, 0);
+                        _setBoats.Get(i)?.DrawningObject(g);
+                        curHeight += _placeSizeHeight;
+                    }
+                    else
+                    {
+                        rightdown = true;
+                        _setBoats.Get(i)?.SetObject(curWidth, curHeight + _placeSizeHeight, _placeSizeWidth, _placeSizeHeight);
+
+                        g.TranslateTransform(-_placeSizeWidth - 90, 0);
+                        _setBoats.Get(i)?.DrawningObject(g);
+
+                    }
+                    if (curHeight >= _pictureHeight - 30) { down = false; return; }
+
+                }
+
+            }
+        }
+    }
+}

MotorBoat/MotorBoat/PinkMap.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+    internal class PinkMap : AbstractMap
+    {
+        /// <summary>
+        /// Цвет участка закрытого
+        /// </summary>
+        private readonly Brush barrierColor = new SolidBrush(Color.Purple);
+        /// <summary>
+        /// Цвет участка открытого
+        /// </summary>
+        private readonly Brush roadColor = new SolidBrush(Color.LightPink);
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.FillEllipse(barrierColor, i *( _size_x-1), j * (_size_y-1), 15, 10);
+        }
+        protected override void DrawRoadPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
+        }
+        protected override void GenerateMap()
+        {
+            _map = new int[100, 100];
+            _size_x = (float)_width / _map.GetLength(0);
+            _size_y = (float)_height / _map.GetLength(1);
+            int counter = 0;
+            for (int i = 0; i < _map.GetLength(0); ++i)
+            {
+                for (int j = 0; j < _map.GetLength(1); ++j)
+                {
+                    _map[i, j] = _freeRoad;
+                }
+            }
+            while (counter < 40)
+            {
+                int x = _random.Next(1, 100);
+                int y = _random.Next(1, 100);
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    }
+}

MotorBoat/MotorBoat/Program.cs

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

MotorBoat/MotorBoat/SeaMap.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+    internal class SeaMap : AbstractMap
+    {
+        /// <summary>
+        /// Цвет участка закрытого
+        /// </summary>
+        private readonly Pen barrierColor = new Pen(Color.DarkBlue, 2);
+        /// <summary>
+        /// Цвет участка открытого
+        /// </summary>
+        private readonly Brush roadColor = new SolidBrush(Color.LightBlue);
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.DrawArc(barrierColor, i * (_size_x - 1), j * (_size_y - 1), 7, 6, 0, 180);
+            g.DrawArc(barrierColor, i * (_size_x - 1) + 6, j * (_size_y - 1), 7, 6, 0, 180);
+        }
+        protected override void DrawRoadPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
+        }
+        protected override void GenerateMap()
+        {
+            _map = new int[100, 100];
+            _size_x = (float)_width / _map.GetLength(0);
+            _size_y = (float)_height / _map.GetLength(1);
+            int counter = 0;
+            for (int i = 0; i < _map.GetLength(0); ++i)
+            {
+                for (int j = 0; j < _map.GetLength(1); ++j)
+                {
+                    _map[i, j] = _freeRoad;
+                }
+            }
+            while (counter < 40)
+            {
+                int x = _random.Next(1, 100);
+                int y = _random.Next(1, 100);
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    }
+}

MotorBoat/MotorBoat/SetBoatsGeneric.cs

@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+	internal class SetBoatsGeneric<T>
+		where T : class
+	{
+		private readonly T[] _places;
+		public int Count => _places.Length;
+		public SetBoatsGeneric(int count)
+		{
+			_places = new T[count];
+		}
+		public int Insert(T boat)
+		{
+			return Insert(boat, 0);
+		}
+		public int Insert(T boat, int position)
+		{
+			// TODO проверка позиции
+			if (position >= _places.Length || position < 0)
+				return -1;
+			// TODO проверка, что элемент массива по этой позиции пустой, если нет, то
+			if (_places[position] == null)
+			{
+				_places[position] = boat;
+				return position;
+			}
+			//		проверка, что после вставляемого элемента в массиве есть пустой элемент
+			int EmptyPos = -1;
+
+			for (int i = position + 1; i < Count; i++)
+			{
+				if (_places[i] == null)
+				{
+					EmptyPos = i;
+					break;
+				}
+			}
+			if (EmptyPos < 0) return -1;
+			//		сдвиг всех объектов, находящихся справа от позиции до первого пустого элемента
+			for (int i = EmptyPos; i > position; i--)
+			{
+				_places[i] = _places[i - 1];
+			}
+			// вставка по позиции
+			_places[position] = boat;
+			return position;
+		}
+		public T Remove(int position)
+		{
+			// TODO проверка позиции
+			if (position >= _places.Length || position < 0) return null;
+			// TODO удаление объекта из массива, присовив элементу массива значение null
+			T temp = _places[position];
+			_places[position] = null;
+			return temp;
+		}
+		public T Get(int position)
+		{
+			// TODO проверка позиции
+			if (position >= _places.Length || position < 0)
+				return null;
+			return _places[position];
+		}
+	}
+}

MotorBoat/MotorBoat/SimpleMap.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+    internal class SimpleMap : AbstractMap
+    {
+        /// <summary>
+        /// Цвет участка закрытого
+        /// </summary>
+        private readonly Brush barrierColor = new SolidBrush(Color.Black);
+        /// <summary>
+        /// Цвет участка открытого
+        /// </summary>
+        private readonly Brush roadColor = new SolidBrush(Color.Gray);
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
+        }
+        protected override void DrawRoadPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
+        }
+        protected override void GenerateMap()
+        {
+            _map = new int[100, 100];
+            _size_x = (float)_width / _map.GetLength(0);
+            _size_y = (float)_height / _map.GetLength(1);
+            int counter = 0;
+            for (int i = 0; i < _map.GetLength(0); ++i)
+            {
+                for (int j = 0; j < _map.GetLength(1); ++j)
+                {
+                    _map[i, j] = _freeRoad;
+                }
+            }
+            while (counter < 50)
+            {
+                int x = _random.Next(0, 100);
+                int y = _random.Next(0, 100);
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    }
+}