лабораторная 7

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/BoatNotFoundException.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+    internal class BoatNotFoundException : ApplicationException
+    {
+        public BoatNotFoundException(int i) : base($"Не найден объект по позиции {i}") { }
+        public BoatNotFoundException() : base() { }
+        public BoatNotFoundException(string message) : base(message) { }
+        public BoatNotFoundException(string message, Exception exception) : base(message, exception) { }
+        protected BoatNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+    }
+}

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,136 @@
+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);
+        }
+        public void SetBodyColor(Color color)
+        {
+            (Boat as EntityBoat).setColor(color);
+        }
+    }
+}

MotorBoat/MotorBoat/DrawningMotorBoat.cs

@@ -1,123 +1,99 @@
 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);
 
+            if (motorBoat.SportLine)
+            {
+                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);
+            }
         }
-        public void ChangeBorders(int width, int height)
+        public void SetExtraColor(Color color)
         {
-            _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;
-            }
+            (Boat as EntityMotorBoat).DopColor = color;
         }
     }
 }

MotorBoat/MotorBoat/DrawningObjectBoat.cs

@@ -0,0 +1,38 @@
+using Microsoft.Extensions.Logging;
+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);
+        }
+        public string GetInfo() => _boat?.GetDataForSave();
+        public static IDrawningObject Create(string data) => new DrawningObjectBoat(data.CreateDrawningBoat());
+    }
+}

MotorBoat/MotorBoat/EntityBoat.cs

@@ -0,0 +1,28 @@
+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; 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;
+        }
+        public void setColor(Color color)
+        {
+            BodyColor = color;
+        }
+    }
+}

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; 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/ExtentionBoat.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+    internal static class ExtentionCar
+    {
+        /// <summary>
+        /// Разделитель для записи информации по объекту в файл
+        /// </summary>
+        private static readonly char _separatorForObject = ':';
+        /// <summary>
+        /// Создание объекта из строки
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        public static DrawningBoat CreateDrawningBoat(this string info)
+        {
+            string[] strs = info.Split(_separatorForObject);
+            if (strs.Length == 3)
+            {
+                return new DrawningBoat(Convert.ToInt32(strs[0]),
+                Convert.ToInt32(strs[1]), Color.FromName(strs[2]));
+            }
+            if (strs.Length == 7)
+            {
+                return new DrawningMotorBoat(Convert.ToInt32(strs[0]),
+                Convert.ToInt32(strs[1]), Color.FromName(strs[2]),
+                Color.FromName(strs[3]), Convert.ToBoolean(strs[4]),
+               Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]));
+            }
+            return null;
+        }
+        /// <summary>
+        /// Получение данных для сохранения в файл
+        /// </summary>
+        /// <param name="drawningCar"></param>
+        /// <returns></returns>
+        public static string GetDataForSave(this DrawningBoat drawningBoat)
+        {
+            var boat = drawningBoat.Boat;
+            var str =
+           $"{boat.Speed}{_separatorForObject}{boat.Weight}{_separatorForObject}{boat.BodyColor.Name}";
+            if (boat is not EntityMotorBoat motorBoat)
+            {
+                return str;
+            }
+            return
+           $"{str}{_separatorForObject}{motorBoat.DopColor.Name}{_separatorForObject}{motorBoat.BodyKit}{_separatorForObject}{motorBoat.Wing}{_separatorForObject}{motorBoat.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/FormBoatConfig.Designer.cs

@@ -0,0 +1,411 @@
+namespace MotorBoat
+{
+    partial class FormBoatConfig
+    {
+        /// <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.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.checkBoxBackside = new System.Windows.Forms.CheckBox();
+            this.labelHardObject = new System.Windows.Forms.Label();
+            this.labelSimpleObject = new System.Windows.Forms.Label();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.panelWhite = new System.Windows.Forms.Panel();
+            this.panelYellow = new System.Windows.Forms.Panel();
+            this.panelGray = new System.Windows.Forms.Panel();
+            this.panelBlue = new System.Windows.Forms.Panel();
+            this.panelGreen = new System.Windows.Forms.Panel();
+            this.panelPurple = new System.Windows.Forms.Panel();
+            this.panelRed = new System.Windows.Forms.Panel();
+            this.panelBlack = new System.Windows.Forms.Panel();
+            this.checkBoxSide = new System.Windows.Forms.CheckBox();
+            this.checkBoxNose = new System.Windows.Forms.CheckBox();
+            this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown();
+            this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown();
+            this.label2 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.pictureBoxObject = new System.Windows.Forms.PictureBox();
+            this.panelobject = new System.Windows.Forms.Panel();
+            this.LabelDopColor = new System.Windows.Forms.Label();
+            this.LabelBaseColor = new System.Windows.Forms.Label();
+            this.buttonOk = new System.Windows.Forms.Button();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.groupBox1.SuspendLayout();
+            this.groupBox2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit();
+            this.panelobject.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.checkBoxBackside);
+            this.groupBox1.Controls.Add(this.labelHardObject);
+            this.groupBox1.Controls.Add(this.labelSimpleObject);
+            this.groupBox1.Controls.Add(this.groupBox2);
+            this.groupBox1.Controls.Add(this.checkBoxSide);
+            this.groupBox1.Controls.Add(this.checkBoxNose);
+            this.groupBox1.Controls.Add(this.numericUpDownWeight);
+            this.groupBox1.Controls.Add(this.numericUpDownSpeed);
+            this.groupBox1.Controls.Add(this.label2);
+            this.groupBox1.Controls.Add(this.label1);
+            this.groupBox1.Location = new System.Drawing.Point(12, 12);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(470, 201);
+            this.groupBox1.TabIndex = 0;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Параметры";
+            // 
+            // checkBoxBackside
+            // 
+            this.checkBoxBackside.AutoSize = true;
+            this.checkBoxBackside.Location = new System.Drawing.Point(6, 170);
+            this.checkBoxBackside.Name = "checkBoxBackside";
+            this.checkBoxBackside.Size = new System.Drawing.Size(115, 19);
+            this.checkBoxBackside.TabIndex = 10;
+            this.checkBoxBackside.Text = "Боковые стойки";
+            this.checkBoxBackside.UseVisualStyleBackColor = true;
+            // 
+            // labelHardObject
+            // 
+            this.labelHardObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelHardObject.Location = new System.Drawing.Point(334, 166);
+            this.labelHardObject.Name = "labelHardObject";
+            this.labelHardObject.RightToLeft = System.Windows.Forms.RightToLeft.No;
+            this.labelHardObject.Size = new System.Drawing.Size(100, 23);
+            this.labelHardObject.TabIndex = 9;
+            this.labelHardObject.Text = "Продвинутый";
+            this.labelHardObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelHardObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.labelSimpleObject_MouseDown);
+            // 
+            // labelSimpleObject
+            // 
+            this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelSimpleObject.Location = new System.Drawing.Point(228, 166);
+            this.labelSimpleObject.Name = "labelSimpleObject";
+            this.labelSimpleObject.Size = new System.Drawing.Size(100, 23);
+            this.labelSimpleObject.TabIndex = 8;
+            this.labelSimpleObject.Text = "Простой";
+            this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.labelSimpleObject_MouseDown);
+            // 
+            // groupBox2
+            // 
+            this.groupBox2.Controls.Add(this.panelWhite);
+            this.groupBox2.Controls.Add(this.panelYellow);
+            this.groupBox2.Controls.Add(this.panelGray);
+            this.groupBox2.Controls.Add(this.panelBlue);
+            this.groupBox2.Controls.Add(this.panelGreen);
+            this.groupBox2.Controls.Add(this.panelPurple);
+            this.groupBox2.Controls.Add(this.panelRed);
+            this.groupBox2.Controls.Add(this.panelBlack);
+            this.groupBox2.Location = new System.Drawing.Point(216, 22);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.Size = new System.Drawing.Size(228, 130);
+            this.groupBox2.TabIndex = 7;
+            this.groupBox2.TabStop = false;
+            this.groupBox2.Text = "Цвета";
+            // 
+            // panelWhite
+            // 
+            this.panelWhite.AllowDrop = true;
+            this.panelWhite.BackColor = System.Drawing.Color.White;
+            this.panelWhite.Location = new System.Drawing.Point(167, 78);
+            this.panelWhite.Name = "panelWhite";
+            this.panelWhite.Size = new System.Drawing.Size(43, 44);
+            this.panelWhite.TabIndex = 3;
+            this.panelWhite.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelYellow
+            // 
+            this.panelYellow.AllowDrop = true;
+            this.panelYellow.BackColor = System.Drawing.Color.Yellow;
+            this.panelYellow.Location = new System.Drawing.Point(167, 28);
+            this.panelYellow.Name = "panelYellow";
+            this.panelYellow.Size = new System.Drawing.Size(43, 44);
+            this.panelYellow.TabIndex = 1;
+            this.panelYellow.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelGray
+            // 
+            this.panelGray.AllowDrop = true;
+            this.panelGray.BackColor = System.Drawing.Color.Gray;
+            this.panelGray.Location = new System.Drawing.Point(118, 78);
+            this.panelGray.Name = "panelGray";
+            this.panelGray.Size = new System.Drawing.Size(43, 44);
+            this.panelGray.TabIndex = 4;
+            this.panelGray.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelBlue
+            // 
+            this.panelBlue.AllowDrop = true;
+            this.panelBlue.BackColor = System.Drawing.Color.Blue;
+            this.panelBlue.Location = new System.Drawing.Point(69, 78);
+            this.panelBlue.Name = "panelBlue";
+            this.panelBlue.Size = new System.Drawing.Size(43, 44);
+            this.panelBlue.TabIndex = 5;
+            this.panelBlue.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelGreen
+            // 
+            this.panelGreen.AllowDrop = true;
+            this.panelGreen.BackColor = System.Drawing.Color.Green;
+            this.panelGreen.Location = new System.Drawing.Point(118, 28);
+            this.panelGreen.Name = "panelGreen";
+            this.panelGreen.Size = new System.Drawing.Size(43, 44);
+            this.panelGreen.TabIndex = 1;
+            this.panelGreen.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelPurple
+            // 
+            this.panelPurple.AllowDrop = true;
+            this.panelPurple.BackColor = System.Drawing.Color.Purple;
+            this.panelPurple.Location = new System.Drawing.Point(20, 78);
+            this.panelPurple.Name = "panelPurple";
+            this.panelPurple.Size = new System.Drawing.Size(43, 44);
+            this.panelPurple.TabIndex = 2;
+            this.panelPurple.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelRed
+            // 
+            this.panelRed.AllowDrop = true;
+            this.panelRed.BackColor = System.Drawing.Color.Red;
+            this.panelRed.Location = new System.Drawing.Point(69, 28);
+            this.panelRed.Name = "panelRed";
+            this.panelRed.Size = new System.Drawing.Size(43, 44);
+            this.panelRed.TabIndex = 1;
+            this.panelRed.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelBlack
+            // 
+            this.panelBlack.AllowDrop = true;
+            this.panelBlack.BackColor = System.Drawing.Color.Black;
+            this.panelBlack.Location = new System.Drawing.Point(20, 28);
+            this.panelBlack.Name = "panelBlack";
+            this.panelBlack.Size = new System.Drawing.Size(43, 44);
+            this.panelBlack.TabIndex = 0;
+            this.panelBlack.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // checkBoxSide
+            // 
+            this.checkBoxSide.AutoSize = true;
+            this.checkBoxSide.Location = new System.Drawing.Point(6, 145);
+            this.checkBoxSide.Name = "checkBoxSide";
+            this.checkBoxSide.Size = new System.Drawing.Size(92, 19);
+            this.checkBoxSide.TabIndex = 5;
+            this.checkBoxSide.Text = "Острый нос";
+            this.checkBoxSide.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxNose
+            // 
+            this.checkBoxNose.AutoSize = true;
+            this.checkBoxNose.Location = new System.Drawing.Point(6, 120);
+            this.checkBoxNose.Name = "checkBoxNose";
+            this.checkBoxNose.Size = new System.Drawing.Size(116, 19);
+            this.checkBoxNose.TabIndex = 4;
+            this.checkBoxNose.Text = "Усеченные бока";
+            this.checkBoxNose.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            this.numericUpDownWeight.Location = new System.Drawing.Point(74, 71);
+            this.numericUpDownWeight.Maximum = new decimal(new int[] {
+            70,
+            0,
+            0,
+            0});
+            this.numericUpDownWeight.Minimum = new decimal(new int[] {
+            40,
+            0,
+            0,
+            0});
+            this.numericUpDownWeight.Name = "numericUpDownWeight";
+            this.numericUpDownWeight.Size = new System.Drawing.Size(120, 23);
+            this.numericUpDownWeight.TabIndex = 3;
+            this.numericUpDownWeight.Value = new decimal(new int[] {
+            50,
+            0,
+            0,
+            0});
+            // 
+            // numericUpDownSpeed
+            // 
+            this.numericUpDownSpeed.Location = new System.Drawing.Point(74, 42);
+            this.numericUpDownSpeed.Maximum = new decimal(new int[] {
+            150,
+            0,
+            0,
+            0});
+            this.numericUpDownSpeed.Minimum = new decimal(new int[] {
+            50,
+            0,
+            0,
+            0});
+            this.numericUpDownSpeed.Name = "numericUpDownSpeed";
+            this.numericUpDownSpeed.Size = new System.Drawing.Size(120, 23);
+            this.numericUpDownSpeed.TabIndex = 2;
+            this.numericUpDownSpeed.Value = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(6, 73);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(29, 15);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "Вес:";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(6, 44);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(62, 15);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "Скорость:";
+            // 
+            // pictureBoxObject
+            // 
+            this.pictureBoxObject.Location = new System.Drawing.Point(12, 42);
+            this.pictureBoxObject.Name = "pictureBoxObject";
+            this.pictureBoxObject.Size = new System.Drawing.Size(212, 122);
+            this.pictureBoxObject.TabIndex = 1;
+            this.pictureBoxObject.TabStop = false;
+            // 
+            // panelobject
+            // 
+            this.panelobject.AllowDrop = true;
+            this.panelobject.Controls.Add(this.LabelDopColor);
+            this.panelobject.Controls.Add(this.LabelBaseColor);
+            this.panelobject.Controls.Add(this.pictureBoxObject);
+            this.panelobject.Location = new System.Drawing.Point(525, 12);
+            this.panelobject.Name = "panelobject";
+            this.panelobject.Size = new System.Drawing.Size(238, 172);
+            this.panelobject.TabIndex = 10;
+            this.panelobject.DragDrop += new System.Windows.Forms.DragEventHandler(this.panelobject_DragDrop);
+            this.panelobject.DragEnter += new System.Windows.Forms.DragEventHandler(this.panelobject_DragEnter);
+            // 
+            // LabelDopColor
+            // 
+            this.LabelDopColor.AllowDrop = true;
+            this.LabelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.LabelDopColor.Location = new System.Drawing.Point(124, 9);
+            this.LabelDopColor.Name = "LabelDopColor";
+            this.LabelDopColor.Size = new System.Drawing.Size(100, 23);
+            this.LabelDopColor.TabIndex = 3;
+            this.LabelDopColor.Text = "Доп.цвет";
+            this.LabelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.LabelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragDrop);
+            this.LabelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragEnter);
+            // 
+            // LabelBaseColor
+            // 
+            this.LabelBaseColor.AllowDrop = true;
+            this.LabelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.LabelBaseColor.Location = new System.Drawing.Point(12, 9);
+            this.LabelBaseColor.Name = "LabelBaseColor";
+            this.LabelBaseColor.Size = new System.Drawing.Size(100, 23);
+            this.LabelBaseColor.TabIndex = 2;
+            this.LabelBaseColor.Text = "Цвет";
+            this.LabelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.LabelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragDrop);
+            this.LabelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragEnter);
+            // 
+            // buttonOk
+            // 
+            this.buttonOk.Location = new System.Drawing.Point(537, 190);
+            this.buttonOk.Name = "buttonOk";
+            this.buttonOk.Size = new System.Drawing.Size(75, 23);
+            this.buttonOk.TabIndex = 11;
+            this.buttonOk.Text = "Добавить";
+            this.buttonOk.UseVisualStyleBackColor = true;
+            this.buttonOk.Click += new System.EventHandler(this.buttonOk_Click);
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(674, 190);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(75, 23);
+            this.buttonCancel.TabIndex = 12;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // FormBoatConfig
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(783, 221);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonOk);
+            this.Controls.Add(this.panelobject);
+            this.Controls.Add(this.groupBox1);
+            this.Name = "FormBoatConfig";
+            this.Text = "FormLocomotiveConfig";
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.groupBox2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit();
+            this.panelobject.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private GroupBox groupBox1;
+        private Label labelHardObject;
+        private Label labelSimpleObject;
+        private GroupBox groupBox2;
+        private Panel panelWhite;
+        private Panel panelYellow;
+        private Panel panelGray;
+        private Panel panelBlue;
+        private Panel panelGreen;
+        private Panel panelPurple;
+        private Panel panelRed;
+        private Panel panelBlack;
+        private CheckBox checkBoxSide;
+        private CheckBox checkBoxNose;
+        private NumericUpDown numericUpDownWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private Label label2;
+        private Label label1;
+        private PictureBox pictureBoxObject;
+        private Panel panelobject;
+        private Label LabelDopColor;
+        private Label LabelBaseColor;
+        private Button buttonOk;
+        private Button buttonCancel;
+        private CheckBox checkBoxBackside;
+    }
+}

MotorBoat/MotorBoat/FormBoatConfig.cs

@@ -0,0 +1,144 @@
+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 FormBoatConfig : Form
+    {
+        private event Action<DrawningBoat> EventAddBoat;
+        DrawningBoat _boat = null;
+        public FormBoatConfig()
+        {
+            InitializeComponent();
+            panelBlack.MouseDown += PanelColor_MouseDown;
+            panelPurple.MouseDown += PanelColor_MouseDown;
+            panelGray.MouseDown += PanelColor_MouseDown;
+            panelGreen.MouseDown += PanelColor_MouseDown;
+            panelRed.MouseDown += PanelColor_MouseDown;
+            panelWhite.MouseDown += PanelColor_MouseDown;
+            panelYellow.MouseDown += PanelColor_MouseDown;
+            panelBlue.MouseDown += PanelColor_MouseDown;
+            buttonCancel.Click += (s, a) => Close();
+        }
+
+        public void AddEvent(Action<DrawningBoat> ev)
+        {
+            if (EventAddBoat == null)
+            {
+                EventAddBoat = new Action<DrawningBoat>(ev);
+            }
+            else
+            {
+                EventAddBoat += ev;
+            }
+        }
+
+        private void DrawBoat()
+        {
+            Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _boat?.SetPosition(5, 135, pictureBoxObject.Width,
+           pictureBoxObject.Height);
+            _boat?.DrawTransport(gr);
+            pictureBoxObject.Image = bmp;
+        }
+
+        private void labelSimpleObject_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Label).DoDragDrop((sender as Label).Name,DragDropEffects.Move | DragDropEffects.Copy);
+
+        }
+
+        private void panelobject_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(DataFormats.Text))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+
+        private void panelobject_DragDrop(object sender, DragEventArgs e)
+        {
+            switch (e.Data.GetData(DataFormats.Text).ToString())
+            {
+                case "labelSimpleObject":
+                    {
+                        _boat = new DrawningBoat((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White);
+                    }
+                    break;
+                case "labelHardObject":
+                    {
+                        _boat = new DrawningMotorBoat((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxNose.Checked, checkBoxSide.Checked, checkBoxBackside.Checked);
+                    }
+                    break;
+            }
+            DrawBoat();
+        }
+
+        private void buttonOk_Click(object sender, EventArgs e)
+        {
+            EventAddBoat?.Invoke(_boat);
+            Close();
+        }
+
+        private void PanelColor_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+
+        private void LabelBaseColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_boat != null)
+            {
+                _boat.SetBodyColor((Color)e.Data.GetData(typeof(Color)));
+                DrawBoat();
+            }
+            else return;
+        }
+
+        private void LabelDopColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if(_boat is not DrawningMotorBoat MotorBoat || _boat==null)
+            {
+                return;
+            }
+            MotorBoat.SetExtraColor((Color)e.Data.GetData(typeof(Color)));
+            DrawBoat();
+        }
+
+        private void LabelBaseColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+
+        private void LabelDopColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+    }
+}

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

@@ -0,0 +1,326 @@
+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.ButtonDeleteMap = new System.Windows.Forms.Button();
+            this.ListBoxMaps = new System.Windows.Forms.ListBox();
+            this.ButtonAddMap = new System.Windows.Forms.Button();
+            this.textBoxNewMapName = new System.Windows.Forms.TextBox();
+            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.menuStrip1 = new System.Windows.Forms.MenuStrip();
+            this.файлToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.SaveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.LoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
+            this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
+            this.groupBoxTools.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.menuStrip1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupBoxTools
+            // 
+            this.groupBoxTools.Controls.Add(this.ButtonDeleteMap);
+            this.groupBoxTools.Controls.Add(this.ListBoxMaps);
+            this.groupBoxTools.Controls.Add(this.ButtonAddMap);
+            this.groupBoxTools.Controls.Add(this.textBoxNewMapName);
+            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(809, 24);
+            this.groupBoxTools.Name = "groupBoxTools";
+            this.groupBoxTools.Size = new System.Drawing.Size(251, 621);
+            this.groupBoxTools.TabIndex = 0;
+            this.groupBoxTools.TabStop = false;
+            this.groupBoxTools.Text = "v";
+            // 
+            // ButtonDeleteMap
+            // 
+            this.ButtonDeleteMap.Location = new System.Drawing.Point(38, 209);
+            this.ButtonDeleteMap.Name = "ButtonDeleteMap";
+            this.ButtonDeleteMap.Size = new System.Drawing.Size(175, 33);
+            this.ButtonDeleteMap.TabIndex = 34;
+            this.ButtonDeleteMap.Text = "Удалить карту";
+            this.ButtonDeleteMap.UseVisualStyleBackColor = true;
+            this.ButtonDeleteMap.Click += new System.EventHandler(this.ButtonDeleteMap_Click);
+            // 
+            // ListBoxMaps
+            // 
+            this.ListBoxMaps.FormattingEnabled = true;
+            this.ListBoxMaps.ItemHeight = 15;
+            this.ListBoxMaps.Location = new System.Drawing.Point(38, 124);
+            this.ListBoxMaps.Name = "ListBoxMaps";
+            this.ListBoxMaps.Size = new System.Drawing.Size(175, 79);
+            this.ListBoxMaps.TabIndex = 33;
+            this.ListBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ListBoxMaps_SelectedIndexChanged);
+            // 
+            // ButtonAddMap
+            // 
+            this.ButtonAddMap.Location = new System.Drawing.Point(38, 89);
+            this.ButtonAddMap.Name = "ButtonAddMap";
+            this.ButtonAddMap.Size = new System.Drawing.Size(175, 29);
+            this.ButtonAddMap.TabIndex = 32;
+            this.ButtonAddMap.Text = "Добавить карту";
+            this.ButtonAddMap.UseVisualStyleBackColor = true;
+            this.ButtonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click);
+            // 
+            // textBoxNewMapName
+            // 
+            this.textBoxNewMapName.Location = new System.Drawing.Point(38, 31);
+            this.textBoxNewMapName.Name = "textBoxNewMapName";
+            this.textBoxNewMapName.Size = new System.Drawing.Size(175, 23);
+            this.textBoxNewMapName.TabIndex = 31;
+            // 
+            // maskedTextBoxPosition
+            // 
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(38, 328);
+            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, 357);
+            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, 412);
+            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, 529);
+            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, 529);
+            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, 529);
+            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, 493);
+            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, 453);
+            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, 287);
+            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, 60);
+            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, 24);
+            this.pictureBox.Name = "pictureBox";
+            this.pictureBox.Size = new System.Drawing.Size(809, 621);
+            this.pictureBox.TabIndex = 0;
+            this.pictureBox.TabStop = false;
+            // 
+            // menuStrip1
+            // 
+            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.файлToolStripMenuItem});
+            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip1.Name = "menuStrip1";
+            this.menuStrip1.Size = new System.Drawing.Size(1060, 24);
+            this.menuStrip1.TabIndex = 1;
+            this.menuStrip1.Text = "menuStrip1";
+            // 
+            // файлToolStripMenuItem
+            // 
+            this.файлToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.SaveToolStripMenuItem,
+            this.LoadToolStripMenuItem});
+            this.файлToolStripMenuItem.Name = "файлToolStripMenuItem";
+            this.файлToolStripMenuItem.Size = new System.Drawing.Size(48, 20);
+            this.файлToolStripMenuItem.Text = "Файл";
+            // 
+            // SaveToolStripMenuItem
+            // 
+            this.SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
+            this.SaveToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.SaveToolStripMenuItem.Text = "Сохранение";
+            this.SaveToolStripMenuItem.Click += new System.EventHandler(this.SaveToolStripMenuItem_Click);
+            // 
+            // LoadToolStripMenuItem
+            // 
+            this.LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
+            this.LoadToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.LoadToolStripMenuItem.Text = "Загрузка";
+            this.LoadToolStripMenuItem.Click += new System.EventHandler(this.LoadToolStripMenuItem_Click);
+            // 
+            // openFileDialog
+            // 
+            this.openFileDialog.FileName = "openFileDialog1";
+            this.openFileDialog.Filter = "txt file | *.txt";
+            // 
+            // saveFileDialog
+            // 
+            this.saveFileDialog.Filter = "txt file | *.txt";
+            // 
+            // FormMapWithSetBoats
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1060, 645);
+            this.Controls.Add(this.pictureBox);
+            this.Controls.Add(this.groupBoxTools);
+            this.Controls.Add(this.menuStrip1);
+            this.Name = "FormMapWithSetBoats";
+            this.Text = "FormMapWithSetBoats";
+            this.groupBoxTools.ResumeLayout(false);
+            this.groupBoxTools.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+            this.menuStrip1.ResumeLayout(false);
+            this.menuStrip1.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #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;
+        private Button ButtonDeleteMap;
+        private ListBox ListBoxMaps;
+        private Button ButtonAddMap;
+        private TextBox textBoxNewMapName;
+        private MenuStrip menuStrip1;
+        private ToolStripMenuItem файлToolStripMenuItem;
+        private ToolStripMenuItem SaveToolStripMenuItem;
+        private ToolStripMenuItem LoadToolStripMenuItem;
+        private OpenFileDialog openFileDialog;
+        private SaveFileDialog saveFileDialog;
+    }
+}

MotorBoat/MotorBoat/FormMapWithSetBoats.cs

@@ -0,0 +1,319 @@
+using Microsoft.Extensions.Logging;
+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
+    {
+        /// <summary>
+        /// Объект от класса карты с набором объектов
+        /// </summary>
+        private MapWithSetBoatsGeneric<DrawningObjectBoat, AbstractMap> _mapShipCollectionGeneric;
+        private readonly Dictionary<string, AbstractMap> _mapDict = new()
+        {
+            {"Простая карта", new SimpleMap() },
+            {"Розовая карта", new PinkMap() },
+            {"Морская карта",new SeaMap() }
+        };
+        private readonly MapsCollection _mapsCollection;
+        private readonly ILogger _logger;
+        /// <summary>
+        /// Конструктор
+         /// </summary>
+        public FormMapWithSetBoats(ILogger<FormMapWithSetBoats> logger)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
+            comboBoxSelectorMap.Items.Clear();
+            foreach (var elem in _mapDict)
+            {
+                comboBoxSelectorMap.Items.Add(elem.Key);
+            }
+        }
+
+        private void ReloadMaps()
+        {
+            int index = ListBoxMaps.SelectedIndex;
+
+            ListBoxMaps.Items.Clear();
+            foreach (var list in _mapsCollection.Keys)
+            {
+                ListBoxMaps.Items.Add(list);
+            }
+
+            if (ListBoxMaps.Items.Count > 0 && (index == -1 || index >= ListBoxMaps.Items.Count))
+            {
+                ListBoxMaps.SelectedIndex = 0;
+            }
+            else if (ListBoxMaps.Items.Count > 0 && index > -1 && index < ListBoxMaps.Items.Count)
+            {
+                ListBoxMaps.SelectedIndex = index;
+            }
+        }
+
+        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)
+            {
+                _mapShipCollectionGeneric = new MapWithSetBoatsGeneric<DrawningObjectBoat, AbstractMap>(
+                    pictureBox.Width, pictureBox.Height, map);
+            }
+            else
+            {
+                _mapShipCollectionGeneric = null;
+            }
+        }
+        /// <summary>
+        /// Выбор карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+
+        /// <summary>
+        /// Добавление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddBoat_Click(object sender, EventArgs e)
+        {
+            var FormBoatConfig = new FormBoatConfig();
+            FormBoatConfig.AddEvent(new(AddBoat));
+            FormBoatConfig.Show();
+
+        }
+
+        public void AddBoat(DrawningBoat boat)
+        {
+            try
+            {
+                if (ListBoxMaps.SelectedIndex == -1)
+                {
+                    return;
+                }
+
+                if (_mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty] + new DrawningObjectBoat(boat) != -1)
+                {
+                 
+                        MessageBox.Show("Объект добавлен");
+                        _logger.LogInformation("Добавлен объект {@Boat}", boat);
+                        pictureBox.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                    
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось добавить объект");
+                    _logger.LogWarning("Не удалось добавить объект");
+                }
+            }
+            catch (StorageOverflowException ex)
+            {
+                _logger.LogWarning("Ошибка, переполнение хранилища :{0}", ex.Message);
+                MessageBox.Show($"Ошибка хранилище переполнено: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+        /// <summary>
+        /// Удаление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRemoveBoat_Click(object sender, EventArgs e)
+        {
+            if (ListBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
+            {
+                return;
+            }
+            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+            try
+            {
+                var boatForDel = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos;
+                if (boatForDel != null)
+                {
+                    MessageBox.Show("Объект удален");
+                    _logger.LogInformation("Из текущей карты удалён объект {@Boat}", boatForDel);
+                    pictureBox.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                }
+                else
+                {
+                    _logger.LogWarning("Не удалось удалить объект по позиции {0}. Объект равен null", pos);
+                    MessageBox.Show("Не удалось удалить объект");
+                }
+            }
+            catch (BoatNotFoundException ex)
+            {
+                _logger.LogWarning("Ошибка удаления: {0}", ex.Message);
+                MessageBox.Show($"Ошибка удаления: {ex.Message}");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogWarning("Неизвестная ошибка удаления: {0}", ex.Message);
+                MessageBox.Show($"Неизвестная ошибка: {ex.Message}");
+            }
+        }
+        /// <summary>
+        /// Вывод набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonShowStorage_Click(object sender, EventArgs e)
+        {
+            if (ListBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            pictureBox.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+        /// <summary>
+        /// Вывод карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonShowOnMap_Click(object sender, EventArgs e)
+        {
+            if (ListBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            pictureBox.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
+        }
+        /// <summary>
+        /// Перемещение
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            if (ListBoxMaps.SelectedIndex == -1)
+            {
+                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 = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
+        }
+
+        private void ButtonAddMap_Click(object sender, EventArgs e)
+        {
+            if (comboBoxSelectorMap.SelectedIndex == -1 || string.IsNullOrEmpty(textBoxNewMapName.Text))
+            {
+                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogWarning("При добавлении карты {0}", comboBoxSelectorMap.SelectedIndex == -1 ? "Не была выбрана карта" : "Не была названа карта");
+                return;
+            }
+            if (!_mapDict.ContainsKey(comboBoxSelectorMap.Text))
+            {
+                MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogWarning("Отсутствует карта с типом {0}", comboBoxSelectorMap.Text);
+                return;
+            }
+            _mapsCollection.AddMap(textBoxNewMapName.Text, _mapDict[comboBoxSelectorMap.Text]);
+            ReloadMaps();
+            _logger.LogInformation($"Добавлена карта: {textBoxNewMapName.Text}");
+        }
+        private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            pictureBox.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+            _logger.LogInformation("Осуществлён переход на карту под названием {0}", ListBoxMaps.SelectedItem?.ToString() ?? string.Empty);
+        }
+
+        private void ButtonDeleteMap_Click(object sender, EventArgs e)
+        {
+            if (ListBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            if (MessageBox.Show($"Удалить карту {ListBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+            {
+                _logger.LogInformation("Удалена карта {0}", ListBoxMaps.SelectedItem?.ToString() ?? string.Empty);
+                _mapsCollection.DelMap(ListBoxMaps.SelectedItem?.ToString() ?? string.Empty);
+                ReloadMaps();
+            }
+        }
+
+        private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (saveFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _mapsCollection.SaveData(saveFileDialog.FileName);
+                    _logger.LogInformation("Сохранение прошло успешно. Расположение файла: {0}", saveFileDialog.FileName);
+                    MessageBox.Show("Сохранение прошло успешно", "Результат",
+                   MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogWarning("Не удалось сохранить файл '{0}'. Текст ошибки: {1}", saveFileDialog.FileName, ex.Message);
+                    MessageBox.Show("Не сохранилось", "Результат",
+                   MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
+
+        private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _mapsCollection.LoadData(openFileDialog.FileName);
+                    _logger.LogInformation("Загрузка данных из файла '{0}' прошла успешно", openFileDialog.FileName);
+                    ReloadMaps();
+                    MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogWarning("Не удалось загрузить файл '{0}'. Текст ошибки: {1}", openFileDialog.FileName, ex.Message);
+                    MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
+    }
+    
+}

MotorBoat/MotorBoat/FormMapWithSetBoats.resx

@@ -0,0 +1,69 @@
+<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>
+  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>14, 13</value>
+  </metadata>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>129, 13</value>
+  </metadata>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>269, 13</value>
+  </metadata>
+</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,44 @@
+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();
+		/// Получение информации по объекту
+		/// </summary>
+		/// <returns></returns>
+		string GetInfo();
+	}
+}

MotorBoat/MotorBoat/MapWithSetBoatsGeneric.cs

@@ -0,0 +1,185 @@
+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>(21);
+            _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();
+            foreach (var boat in _setBoats.GetBoat())
+            {
+                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[i] == null)
+                {
+                    for (; j > i; j--)
+                    {
+                        var boat = _setBoats[j];
+                        if (boat != null)
+                        {
+                            _setBoats.Insert(boat, 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;
+
+            foreach (var boat in _setBoats.GetBoat())
+            {
+                if (right)
+                {
+                    boat.SetObject(curWidth, curHeight + _placeSizeHeight, _placeSizeWidth, _placeSizeHeight);
+                    g.RotateTransform(270, 0);
+                    g.TranslateTransform(-190, 0);
+                    boat.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;
+                        boat.SetObject(curWidth, curHeight + _placeSizeHeight, _placeSizeWidth, _placeSizeHeight);
+                        g.TranslateTransform(_placeSizeWidth + 90, 0);
+                        boat.DrawningObject(g);
+                        curHeight += _placeSizeHeight;
+                    }
+                    else
+                    {
+                        rightdown = true;
+                        boat.SetObject(curWidth, curHeight + _placeSizeHeight, _placeSizeWidth, _placeSizeHeight);
+
+                        g.TranslateTransform(-_placeSizeWidth - 90, 0);
+                        boat.DrawningObject(g);
+
+                    }
+                    if (curHeight >= _pictureHeight - 30) { down = false; return; }
+
+                }
+
+            }
+        }
+        public string GetData(char separatorType, char separatorData)
+        {
+            string data = $"{_map.GetType().Name}{separatorType}";
+            foreach (var boat in _setBoats.GetBoat())
+            {
+                data += $"{boat.GetInfo()}{separatorData}";
+            }
+            return data;
+        }
+        public void LoadData(string[] records)
+        {
+            foreach (var rec in records)
+            {
+                _setBoats.Insert(DrawningObjectBoat.Create(rec) as T);
+            }
+        }
+
+    }
+}

MotorBoat/MotorBoat/MapsCollection.cs

@@ -0,0 +1,101 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+    internal class MapsCollection
+    {
+
+        readonly Dictionary<string, MapWithSetBoatsGeneric<IDrawningObject, AbstractMap>> _mapStorages;
+        public List<string> Keys => _mapStorages.Keys.ToList();
+        private readonly int _pictureWidth;
+        private readonly int _pictureHeight;
+        private readonly char separatorDict = '|';
+        private readonly char separatorData = ';';
+        public MapsCollection(int pictureWidth, int pictureHeight)
+        {
+            _mapStorages = new Dictionary<string, MapWithSetBoatsGeneric<IDrawningObject, AbstractMap>>();
+            _pictureWidth = pictureWidth;
+            _pictureHeight = pictureHeight;
+        }
+        public void AddMap(string name, AbstractMap map)
+        {
+            if (!_mapStorages.ContainsKey(name))
+            {
+                _mapStorages.Add(name, new MapWithSetBoatsGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+            }
+        }
+        public void DelMap(string name)
+        {
+            if (_mapStorages.ContainsKey(name)) _mapStorages.Remove(name);
+        }
+        public MapWithSetBoatsGeneric<IDrawningObject, AbstractMap> this[string ind]
+        {
+            get
+            {
+                if (_mapStorages.ContainsKey(ind))
+                {
+                    return _mapStorages[ind];
+                }
+                return null;
+            }
+        }
+
+        public void SaveData(string filename)
+        {
+            if (File.Exists(filename))
+            {
+                File.Delete(filename);
+            }
+            using (StreamWriter fs = new StreamWriter(filename))
+            {
+                fs.Write($"MapsCollection{Environment.NewLine}");
+                foreach (var storage in _mapStorages)
+                {
+
+                    fs.Write($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}{Environment.NewLine}");
+                }
+            }
+        }
+        public void LoadData(string filename)
+        {
+            if (!File.Exists(filename))
+            {
+                throw new FileNotFoundException("Файл не найден");
+            }
+            string str = "";
+            using (StreamReader fs = new StreamReader(filename))
+            {
+                str = fs.ReadLine();
+                if (!str.Contains("MapsCollection"))
+                {
+                    throw new FileFormatException("Формат данных в файле не правильный");
+                }
+                _mapStorages.Clear();
+                while ((str = fs.ReadLine()) != null)
+                {
+                    var elem = str.Split(separatorDict);
+                    AbstractMap map = null;
+                    switch (elem[1])
+                    {
+                        case "SimpleMap":
+                            map = new SimpleMap();
+                            break;
+                        case "PinkMap":
+                            map = new PinkMap();
+                            break;
+                        case "SeaMap":
+                            map = new SeaMap();
+                            break;
+                    }
+                    _mapStorages.Add(elem[0], new MapWithSetBoatsGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+                    _mapStorages[elem[0]].LoadData(elem[2].Split(separatorData,StringSplitOptions.RemoveEmptyEntries));
+                }
+            }
+        }
+
+    }
+}

MotorBoat/MotorBoat/MotorBoat.csproj

@@ -8,6 +8,18 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
+    <PackageReference Include="Serilog.Settings.AppSettings" Version="2.2.2" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageReference Include="Serilog.Sinks.InfluxDBv2" Version="1.0.0" />
+    <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>

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

@@ -1,3 +1,8 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Serilog;
+
 namespace MotorBoat
 {
     internal static class Program
@@ -11,7 +16,27 @@ 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());
+            var services = new ServiceCollection();
+            ConfigureServices(services);
+            using (ServiceProvider serviceProvider = services.BuildServiceProvider())
+            {
+                Application.Run(serviceProvider.GetRequiredService<FormMapWithSetBoats>());
+            }
+        }
+        private static void ConfigureServices(ServiceCollection services)
+        {
+            services.AddSingleton<FormMapWithSetBoats>()
+                .AddLogging(option =>
+                {
+                    var configuration = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory())
+                    .AddJsonFile(path: "appSetting.json", optional: false, reloadOnChange: true)
+                    .Build();
+                    var logger = new LoggerConfiguration().ReadFrom.Configuration(configuration)
+                    .WriteTo.RollingFile("Logs\\log.txt")
+                    .CreateLogger();
+                    option.SetMinimumLevel(LogLevel.Information);
+                    option.AddSerilog(logger);
+                });
         }
     }
 }

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,79 @@
+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 List<T> _places;
+		public int Count => _places.Count;
+		private readonly int _maxCount;
+		public SetBoatsGeneric(int count)
+		{
+			_maxCount = count;
+			_places = new List<T>();
+		}
+		public int Insert(T boat)
+		{
+			if (_places.Count > _maxCount)
+			{
+				return -1;
+			}
+			return Insert(boat, 0);
+		}
+		public int Insert(T boat, int position)
+		{
+			if (Count == _maxCount) { throw new StorageOverflowException(_maxCount); }
+			if (position > _maxCount || position < 0) return -1;
+			_places.Insert(position, boat);
+			return position;
+		}
+		public T Remove(int position)
+		{
+			// TODO проверка позиции
+			if (position >= Count || position < 0) throw new BoatNotFoundException(position);
+			// TODO удаление объекта из массива, присовив элементу массива значение null
+			T temp = _places[position];
+			_places.RemoveAt(position);
+			return temp;
+		}
+		public T this[int position]
+		{
+			get
+			{
+				if (position >= _places.Count || position < 0)
+				{
+					return null;
+				}
+				return _places[position];
+			}
+			set
+			{
+				if (position >= _places.Count || position < 0)
+				{
+					return;
+				}
+				Insert(value, position);
+
+			}
+		}
+		public IEnumerable<T> GetBoat()
+		{
+			foreach (var boat in _places)
+			{
+				if (boat != null)
+				{
+					yield return boat;
+				}
+				else
+				{
+					yield break;
+				}
+			}
+		}
+	}
+}

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++;
+                }
+            }
+        }
+    }
+}

MotorBoat/MotorBoat/StorageOverflowException.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+    [Serializable]
+    internal class StorageOverflowException : ApplicationException
+    {
+        public StorageOverflowException(int count) : base($"В наборе превышено допустимое количество: {count}") { }
+        public StorageOverflowException() : base() { }
+        public StorageOverflowException(string message) : base(message) { }
+        public StorageOverflowException(string message, Exception exception) : base(message, exception) { }
+        protected StorageOverflowException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+    }
+}

MotorBoat/MotorBoat/appSetting.json

@@ -0,0 +1,19 @@
+{
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.File" ],
+    "MinimumLevel": "Information",
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": {
+          "rollingInterval": "Day",
+          "outputTemplate": "[{Timestamp:HH:mm:ss.fff}]{Level:u4}: {Message:lj}{NewLine}{Exception}"
+        }
+      }
+    ],
+    "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ],
+    "Properties": {
+      "Application": "MotorBoat"
+    }
+  }
+}