исправление комментариев

.gitignore

@@ -398,3 +398,4 @@ FodyWeavers.xsd
 # JetBrains Rider
 *.sln.iml
 
+/WarmlyShip/WarmlyShip/Properties

WarmlyShip/WarmlyShip.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32414.318
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WarmlyShip", "WarmlyShip\WarmlyShip.csproj", "{007C3F82-87B9-4701-BE6F-6598A4B1AE7E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WarmlyShip", "WarmlyShip\WarmlyShip.csproj", "{007C3F82-87B9-4701-BE6F-6598A4B1AE7E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

WarmlyShip/WarmlyShip/AbstractMap.cs

@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+    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 bool CheckAround(float Left, float Right, float Top, float Bottom)
+        {
+            int startX = (int)(Left / _size_x);
+            int startY = (int)(Right / _size_y);
+            int endX = (int)(Top / _size_x);
+            int endY = (int)(Bottom / _size_y);
+
+            for (int i = startX; i <= endX; i++)
+            {
+                for (int j = startY; j <= endY; j++)
+                {
+                    if (_map[i, j] == _barrier)
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        public Bitmap MoveObject(Direction direction)
+        {
+            _drawningObject.MoveObject(direction);
+            (float Left, float Right, float Top, float Bottom) = _drawningObject.GetCurrentPosition();
+
+            if (CheckAround(Left, Right, Top, Bottom))
+            {
+                _drawningObject.MoveObject(MoveObjectBack(direction));
+            }
+            return DrawMapWithObject();
+
+        }
+        private Direction MoveObjectBack(Direction direction)
+        {
+            switch (direction)
+            {
+                case Direction.Up:
+                    return Direction.Down;
+                case Direction.Down:
+                    return Direction.Up;
+                case Direction.Left:
+                    return Direction.Right;
+                case Direction.Right:
+                    return Direction.Left;
+            }
+            return Direction.None;
+        }
+        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);
+            (float Left, float Right, float Top, float Bottom) = _drawningObject.GetCurrentPosition();
+            if (!CheckAround(Left, Right, Top, Bottom)) return true;
+            float startX = Left;
+            float startY = Right;
+            float lengthX = Top - Left;
+            float lengthY = Bottom - Right;
+            while (CheckAround(startX, startY, startX + lengthX, startY + lengthY))
+            {
+                bool result;
+                do
+                {
+                    result = CheckAround(startX, startY, startX + lengthX, startY + lengthY);
+                    if (!result)
+                    {
+                        _drawningObject.SetObject((int)startX, (int)startY, _width, _height);
+                        return true;
+                    }
+                    else
+                    {
+                        startX += _size_x;
+                    }
+                } while (result);
+                startX = x;
+                startY += _size_y;
+            }
+            return false;
+        }
+        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);
+    }
+}

WarmlyShip/WarmlyShip/Direction.cs

@@ -8,6 +8,7 @@ namespace WarmlyShip
 {
     internal enum Direction
     {
+        None = 0,
         Up = 1,
         Down = 2,
         Left = 3,

WarmlyShip/WarmlyShip/DrawningObjectShip.cs

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

WarmlyShip/WarmlyShip/DrawningShip.cs

@@ -0,0 +1,195 @@
+namespace WarmlyShip
+{
+    internal class DrawningShip
+    {
+        /// <summary>
+        /// Класс-сущность
+        /// </summary>
+        public EntityShip Ship { get; protected set; }
+        /// <summary>
+        /// Левая координата отрисовки коробля
+        /// </summary>
+        protected float _startPosX;
+        /// <summary>
+        /// Верхняя кооридната отрисовки коробля
+        /// </summary>
+        protected float _startPosY;
+        /// <summary>
+        /// Ширина окна отрисовки
+        /// </summary>
+        private int? _pictureWidth = null;
+        /// <summary>
+        /// Высота окна отрисовки
+        /// </summary>
+        private int? _pictureHeight = null;
+        /// <summary>
+        /// Ширина отрисовки коробля
+        /// </summary>
+        private readonly int _shipWidth = 170;
+        /// <summary>
+        /// Высота отрисовки коробля
+        /// </summary>
+        private readonly int _shipHeight = 65;
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес корабля</param>
+        /// <param name="bodyColor">Цвет корабля</param>
+        public DrawningShip(int speed, float weight, Color bodyColor)
+        {
+            Ship = new EntityShip(speed, weight, bodyColor);
+        }
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес коробля</param>
+        /// <param name="bodyColor">Цвет основной части</param>
+        /// <param name="shipWidth">Ширина отрисовки корабля</param>
+        /// <param name="shipHeight">Высота отрисовки корабля</param>
+
+        protected DrawningShip(int speed, float weight, Color bodyColor, int shipWidth, int shipHeight) :
+           this(speed, weight, bodyColor)
+        {
+            _shipWidth = shipWidth;
+            _shipHeight = shipHeight;
+        }               
+        /// <summary>
+        /// Установка позиции коробля
+        /// </summary>
+        /// <param name="x">Координата X</param>
+        /// <param name="y">Координата Y</param>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param>
+        /// 
+
+        public void SetPosition(int x, int y, int width, int height)
+        {
+            if (x < 0 || y < 0 || width < x + _shipWidth || height < y + _shipHeight)
+            {
+                _pictureHeight = null;
+                _pictureWidth = null;
+                return;
+            }
+            _startPosX = x;
+            _startPosY = y;
+            _pictureWidth = width;
+            _pictureHeight = height;
+        }
+        /// <summary>
+        /// Изменение направления пермещения
+        /// </summary>
+        /// <param name="direction">Направление</param>
+        public void MoveTransport(Direction direction)
+        {
+            if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
+            {
+                return;
+            }
+            switch (direction)
+            {
+                // вправо
+                case Direction.Right:
+                    if (_startPosX + _shipWidth + Ship.Step < _pictureWidth)
+                    {
+                        _startPosX += Ship.Step;
+                    }
+                    break;
+                //влево
+                case Direction.Left:
+                    
+                    if (_startPosX - Ship.Step > 0)
+                    {
+                        _startPosX -= Ship.Step;
+                    }
+                    break;
+                //вверх
+                case Direction.Up:
+                    
+                    if (_startPosY - Ship.Step > 0)
+                    {
+                        _startPosY -= Ship.Step;
+                    }
+                    break;
+                //вниз
+                case Direction.Down:
+                    if (_startPosY + _shipHeight + Ship.Step < _pictureHeight)
+                    {
+                        _startPosY += Ship.Step;
+                    }
+                    break;
+            }
+        }
+        /// <summary>
+        /// Отрисовка корабля
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void DrawTransport(Graphics g)
+        {
+            if (_startPosX < 0 || _startPosY < 0
+                || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
+            {
+                return;
+            }
+
+
+            ///заполнение коробля
+            PointF[] P =
+                {
+                    new Point((int)(_startPosX),(int) _startPosY + 35),
+                    new Point((int)_startPosX + 170, (int)_startPosY + 35),
+                    new Point( (int) _startPosX + 150,(int) _startPosY + 65),
+                    new Point((int) _startPosX + 50, (int) _startPosY + 65),
+                    new Point((int) _startPosX, (int) _startPosY + 35),
+
+            };
+            Brush br = new SolidBrush(Ship?.BodyColor ?? Color.Black);
+            g.FillPolygon(br, P);
+
+            Brush brBlue = new SolidBrush(Color.LightBlue);
+            g.FillRectangle(brBlue, _startPosX + 50, _startPosY + 1, 100, 34);
+
+            Pen pen = new(Color.Black);
+            ///границы коробля
+            g.DrawRectangle(pen, _startPosX + 50, _startPosY + 1, 100, 34);
+            g.DrawLine(pen, _startPosX, _startPosY + 35, _startPosX + 170, _startPosY + 35);
+            g.DrawLine(pen, _startPosX, _startPosY + 35, _startPosX + 50, _startPosY + 65);
+            g.DrawLine(pen, _startPosX + 50, _startPosY + 65, _startPosX + 150, _startPosY + 65);
+            g.DrawLine(pen, _startPosX + 150, _startPosY + 65, _startPosX + 170, _startPosY + 35);
+        }
+
+        /// <summary>
+        /// Смена границ формы отрисовки
+        /// </summary>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param>
+        public void ChangeBorders(int width, int height)
+        {
+            _pictureWidth = width;
+            _pictureHeight = height;
+            if (_pictureWidth <= _shipWidth || _pictureHeight <= _shipHeight)
+            {
+                _pictureWidth = null;
+                _pictureHeight = null;
+                return;
+            }
+            if (_startPosX + _shipWidth > _pictureWidth)
+            {
+                _startPosX = _pictureWidth.Value - _shipWidth;
+            }
+            if (_startPosY + _shipHeight > _pictureHeight)
+            {
+                _startPosY = _pictureHeight.Value - _shipHeight;
+            }
+        }
+        /// <summary>
+        /// Получение текущей позиции объекта
+        /// </summary>
+        /// <returns></returns>
+        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+        {
+            return (_startPosX, _startPosY, _startPosX + _shipWidth, _startPosY + _shipHeight);
+        }
+    }
+}

WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs

@@ -1,171 +1,56 @@
-namespace WarmlyShip
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
 {
-    internal class DrawningWarmlyShip
+    internal class DrawningWarmlyShip : DrawningShip
     {
-        /// <summary>
-        /// Класс-сущность
-        /// </summary>
-        public EntityWarmlyShip Ship { get; private set; }
-        /// <summary>
-        /// Левая координата отрисовки коробля
-        /// </summary>
-        private float _startPosX;
-        /// <summary>
-        /// Верхняя кооридната отрисовки коробля
-        /// </summary>
-        private float _startPosY;
-        /// <summary>
-        /// Ширина окна отрисовки
-        /// </summary>
-        private int? _pictureWidth = null;
-        /// <summary>
-        /// Высота окна отрисовки
-        /// </summary>
-        private int? _pictureHeight = null;
-        /// <summary>
-        /// Ширина отрисовки коробля
-        /// </summary>
-        private readonly int _shipWidth = 170;
-        /// <summary>
-        /// Высота отрисовки коробля
-        /// </summary>
-        private readonly int _shipHeight = 65;
         /// <summary>
         /// Инициализация свойств
         /// </summary>
         /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес коробля</param>
-        /// <param name="bodyColor">Цвет основной части</param>
-        public void Init(int speed, float weight, Color bodyColor)
+        /// <param name="weight">Вес автомобиля</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        /// <param name="dopColor">Дополнительный цвет</param>
+        /// <param name="pipes">Признак наличия труб</param>
+        /// <param name="fuelCompartment">Признак наличия топливного отсека</param>
+        public DrawningWarmlyShip(int speed, float weight, Color bodyColor, Color dopColor, bool pipes, bool fuelCompartment) :
+            base(speed, weight, bodyColor, 170, 95)
         {
-            Ship = new EntityWarmlyShip();
-            Ship.Init(speed, weight, bodyColor);
-        }                       
-        /// <summary>
-        /// Установка позиции коробля
-        /// </summary>
-        /// <param name="x">Координата X</param>
-        /// <param name="y">Координата Y</param>
-        /// <param name="width">Ширина картинки</param>
-        /// <param name="height">Высота картинки</param>
-        public void SetPosition(int x, int y, int width, int height)
-        {
-            if (x < 0 || y < 0 || width < x + _shipWidth || height < y + _shipHeight)
-            {
-                _pictureHeight = null;
-                _pictureWidth = null;
-                return;
-            }
-            _startPosX = x;
-            _startPosY = y;
-            _pictureWidth = width;
-            _pictureHeight = height;
+            Ship = new EntityWarmlyShip(speed, weight, bodyColor, dopColor, pipes, fuelCompartment);
         }
-        /// <summary>
-        /// Изменение направления пермещения
-        /// </summary>
-        /// <param name="direction">Направление</param>
-        public void MoveTransport(Direction direction)
+        public override void DrawTransport(Graphics g)
         {
-            if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
+            if (Ship is not EntityWarmlyShip warmlyShip)
             {
                 return;
             }
-            switch (direction)
-            {
-                // вправо
-                case Direction.Right:
-                    if (_startPosX + _shipWidth + Ship.Step < _pictureWidth)
-                    {
-                        _startPosX += Ship.Step;
-                    }
-                    break;
-                //влево
-                case Direction.Left:
-                    
-                    if (_startPosX - Ship.Step > 0)
-                    {
-                        _startPosX -= Ship.Step;
-                    }
-                    break;
-                //вверх
-                case Direction.Up:
-                    
-                    if (_startPosY - Ship.Step > 0)
-                    {
-                        _startPosY -= Ship.Step;
-                    }
-                    break;
-                //вниз
-                case Direction.Down:
-                    if (_startPosY + _shipHeight + Ship.Step < _pictureHeight)
-                    {
-                        _startPosY += Ship.Step;
-                    }
-                    break;
-            }
-        }
-        /// <summary>
-        /// Отрисовка корабля
-        /// </summary>
-        /// <param name="g"></param>
-        public void DrawTransport(Graphics g)
-        {
-            if (_startPosX < 0 || _startPosY < 0
-                || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
-            {
-                return;
-            }
-            
-
-            //заполнение коробля
-
-            PointF[] P =
-                {
-                    new Point((int)(_startPosX),(int) _startPosY + 35),
-                    new Point((int)_startPosX + 170, (int)_startPosY + 35),
-                    new Point( (int) _startPosX + 150,(int) _startPosY + 65),
-                    new Point((int) _startPosX + 50, (int) _startPosY + 65),
-                    new Point((int) _startPosX, (int) _startPosY + 35),
-
-            };
-            Brush br = new SolidBrush(Ship?.BodyColor ?? Color.Black);
-            g.FillPolygon(br, P);
-
-            Brush brBlue = new SolidBrush(Color.LightBlue);
-            g.FillRectangle(brBlue, _startPosX + 70, _startPosY + 1, 70, 34);
 
             Pen pen = new(Color.Black);
-            //границы коробля
-            g.DrawRectangle(pen, _startPosX + 70, _startPosY + 1 , 70, 34);
-            g.DrawLine(pen, _startPosX, _startPosY + 35, _startPosX + 170, _startPosY + 35);
-            g.DrawLine(pen, _startPosX, _startPosY + 35, _startPosX + 50, _startPosY + 65);
-            g.DrawLine(pen, _startPosX + 50, _startPosY + 65, _startPosX + 150, _startPosY + 65);
-            g.DrawLine(pen, _startPosX + 150, _startPosY + 65, _startPosX + 170, _startPosY + 35);
-        }
+            Brush dopBrush = new SolidBrush(warmlyShip.DopColor);
 
-        /// <summary>
-        /// Смена границ формы отрисовки
-        /// </summary>
-        /// <param name="width">Ширина картинки</param>
-        /// <param name="height">Высота картинки</param>
-        public void ChangeBorders(int width, int height)
-        {
-            _pictureWidth = width;
-            _pictureHeight = height;
-            if (_pictureWidth <= _shipWidth || _pictureHeight <= _shipHeight)
+            if (warmlyShip.Pipes)
             {
-                _pictureWidth = null;
-                _pictureHeight = null;
-                return;
+                g.FillRectangle(dopBrush, _startPosX + 60, _startPosY + 10, 20, 26);
+                g.DrawRectangle(pen, _startPosX + 60, _startPosY + 10, 20, 26);
+                g.FillRectangle(dopBrush, _startPosX + 90, _startPosY + 5, 20, 31);
+                g.DrawRectangle(pen, _startPosX + 90, _startPosY + 5, 20, 31);
+                g.FillRectangle(dopBrush, _startPosX + 120, _startPosY + 1, 20, 35);
+                g.DrawRectangle(pen, _startPosX + 120, _startPosY + 1, 20, 35);
+
             }
-            if (_startPosX + _shipWidth > _pictureWidth)
+
+            _startPosY += 30;
+           base.DrawTransport(g);
+            _startPosY -= 30;
+
+            if (warmlyShip.FuelCompartment)
             {
-                _startPosX = _pictureWidth.Value - _shipWidth;
-            }
-            if (_startPosY + _shipHeight > _pictureHeight)
-            {
-                _startPosY = _pictureHeight.Value - _shipHeight;
+                g.FillRectangle(dopBrush, _startPosX + 135, _startPosY + 70, 10, 5);
+                g.DrawRectangle(pen, _startPosX + 135, _startPosY + 70, 10, 5);
             }
         }
     }

WarmlyShip/WarmlyShip/EntityShip.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+    internal class EntityShip
+    {
+        /// <summary>
+        /// Скорость
+        /// </summary>
+        public int Speed { get; private set; }
+        /// <summary>
+        /// Вес
+        /// </summary>
+        public float Weight { get; private set; }
+        /// <summary>
+        /// Цвет коробля
+        /// </summary>
+        public Color BodyColor { get; private set; }
+        /// <summary>
+        /// Шаг перемещения коробля
+        /// </summary>
+        public float Step => Speed * 100 / Weight;
+        /// <summary>
+        /// Инициализация полей объекта-класса коробля
+        /// </summary>
+        /// <param name="speed"></param>
+        /// <param name="weight"></param>
+        /// <param name="bodyColor"></param>
+        /// <returns></returns>
+        public EntityShip(int speed, float weight, Color bodyColor)
+        {
+            Random rnd = new();
+            Speed = speed <= 0 ? rnd.Next(50, 150) : speed;
+            Weight = weight <= 0 ? rnd.Next(40, 70) : weight;
+            BodyColor = bodyColor;
+        }
+    }
+}

WarmlyShip/WarmlyShip/EntityWarmlyShip.cs

@@ -6,37 +6,35 @@ using System.Threading.Tasks;
 
 namespace WarmlyShip
 {
-    internal class EntityWarmlyShip
+    internal class EntityWarmlyShip : EntityShip
     {
         /// <summary>
-        /// Скорость
+        /// Дополнительный цвет
         /// </summary>
-        public int Speed { get; private set; }
+        public Color DopColor { get; private set; }
         /// <summary>
-        /// Вес
+        /// Признак наличия труб
         /// </summary>
-        public float Weight { get; private set; }
+        public bool Pipes { get; private set; }
         /// <summary>
-        /// Цвет кузова
+        /// Признак наличия топливного отсека
         /// </summary>
-        public Color BodyColor { get; private set; }
+        public bool FuelCompartment { get; private set; }
         /// <summary>
-        /// Шаг перемещения автомобиля
+        /// Инициализация свойств
         /// </summary>
-        public float Step => Speed * 100 / Weight;
-        /// <summary>
-        /// Инициализация полей объекта-класса автомобиля
-        /// </summary>
-        /// <param name="speed"></param>
-        /// <param name="weight"></param>
-        /// <param name="bodyColor"></param>
-        /// <returns></returns>
-        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="pipes">Признак наличия труб</param>
+        /// <param name="fuelCompartment">Признак наличия топливного отсека</param>
+        public EntityWarmlyShip(int speed, float weight, Color bodyColor, Color dopColor, bool pipes, bool fuelCompartment) :
+            base(speed, weight, bodyColor)
         {
-            Random rnd = new();
-            Speed = speed <= 0 ? rnd.Next(50, 150) : speed;
-            Weight = weight <= 0 ? rnd.Next(40, 70) : weight;
-            BodyColor = bodyColor;
+            DopColor = dopColor;
+            Pipes = pipes;
+            FuelCompartment = fuelCompartment;
         }
     }
 }

WarmlyShip/WarmlyShip/FormMap.Designer.cs

@@ -0,0 +1,213 @@
+namespace WarmlyShip
+{
+    partial class FormMap
+    {
+        /// <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.pictureBoxShip = new System.Windows.Forms.PictureBox();
+            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
+            this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
+            this.buttonCreate = new System.Windows.Forms.Button();
+            this.buttonDown = new System.Windows.Forms.Button();
+            this.buttonUp = new System.Windows.Forms.Button();
+            this.buttonRight = new System.Windows.Forms.Button();
+            this.buttonLeft = new System.Windows.Forms.Button();
+            this.ButtonCreateModif = new System.Windows.Forms.Button();
+            this.ComboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).BeginInit();
+            this.statusStrip1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // pictureBoxShip
+            // 
+            this.pictureBoxShip.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pictureBoxShip.Location = new System.Drawing.Point(0, 0);
+            this.pictureBoxShip.Name = "pictureBoxShip";
+            this.pictureBoxShip.Size = new System.Drawing.Size(800, 424);
+            this.pictureBoxShip.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+            this.pictureBoxShip.TabIndex = 0;
+            this.pictureBoxShip.TabStop = false;
+            // 
+            // statusStrip1
+            // 
+            this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
+            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripStatusLabelSpeed,
+            this.toolStripStatusLabelWeight,
+            this.toolStripStatusLabelBodyColor});
+            this.statusStrip1.Location = new System.Drawing.Point(0, 424);
+            this.statusStrip1.Name = "statusStrip1";
+            this.statusStrip1.Size = new System.Drawing.Size(800, 26);
+            this.statusStrip1.TabIndex = 1;
+            this.statusStrip1.Text = "statusStrip1";
+            // 
+            // toolStripStatusLabelSpeed
+            // 
+            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
+            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(80, 20);
+            this.toolStripStatusLabelSpeed.Text = "Скорость: ";
+            // 
+            // toolStripStatusLabelWeight
+            // 
+            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
+            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(40, 20);
+            this.toolStripStatusLabelWeight.Text = "Вес: ";
+            // 
+            // toolStripStatusLabelBodyColor
+            // 
+            this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
+            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(49, 20);
+            this.toolStripStatusLabelBodyColor.Text = "Цвет: ";
+            // 
+            // buttonCreate
+            // 
+            this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.buttonCreate.Location = new System.Drawing.Point(12, 367);
+            this.buttonCreate.Name = "buttonCreate";
+            this.buttonCreate.Size = new System.Drawing.Size(94, 29);
+            this.buttonCreate.TabIndex = 2;
+            this.buttonCreate.Text = "Создать";
+            this.buttonCreate.UseVisualStyleBackColor = true;
+            this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click);
+            // 
+            // buttonDown
+            // 
+            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonDown.BackgroundImage = global::WarmlyShip.Properties.Resources.arrowDown;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonDown.Location = new System.Drawing.Point(701, 367);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(30, 30);
+            this.buttonDown.TabIndex = 3;
+            this.buttonDown.Text = " ";
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.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::WarmlyShip.Properties.Resources.arrowUp;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUp.Location = new System.Drawing.Point(701, 331);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(30, 30);
+            this.buttonUp.TabIndex = 4;
+            this.buttonUp.Text = " ";
+            this.buttonUp.UseVisualStyleBackColor = true;
+            this.buttonUp.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::WarmlyShip.Properties.Resources.arrowRight;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonRight.Location = new System.Drawing.Point(737, 367);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(30, 30);
+            this.buttonRight.TabIndex = 5;
+            this.buttonRight.Text = " ";
+            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::WarmlyShip.Properties.Resources.arrowLeft;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(665, 368);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
+            this.buttonLeft.TabIndex = 6;
+            this.buttonLeft.Text = " ";
+            this.buttonLeft.UseVisualStyleBackColor = true;
+            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // 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(126, 367);
+            this.ButtonCreateModif.Name = "ButtonCreateModif";
+            this.ButtonCreateModif.Size = new System.Drawing.Size(120, 29);
+            this.ButtonCreateModif.TabIndex = 7;
+            this.ButtonCreateModif.Text = "Модификация";
+            this.ButtonCreateModif.UseVisualStyleBackColor = true;
+            this.ButtonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
+            // 
+            // ComboBoxSelectorMap
+            // 
+            this.ComboBoxSelectorMap.FormattingEnabled = true;
+            this.ComboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Океан"});
+            this.ComboBoxSelectorMap.Location = new System.Drawing.Point(12, 12);
+            this.ComboBoxSelectorMap.Name = "ComboBoxSelectorMap";
+            this.ComboBoxSelectorMap.Size = new System.Drawing.Size(182, 28);
+            this.ComboBoxSelectorMap.TabIndex = 8;
+            this.ComboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
+            // 
+            // FormMap
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.ComboBoxSelectorMap);
+            this.Controls.Add(this.ButtonCreateModif);
+            this.Controls.Add(this.buttonLeft);
+            this.Controls.Add(this.buttonRight);
+            this.Controls.Add(this.buttonUp);
+            this.Controls.Add(this.buttonDown);
+            this.Controls.Add(this.buttonCreate);
+            this.Controls.Add(this.pictureBoxShip);
+            this.Controls.Add(this.statusStrip1);
+            this.Name = "FormMap";
+            this.Text = "Карта";
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).EndInit();
+            this.statusStrip1.ResumeLayout(false);
+            this.statusStrip1.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private PictureBox pictureBoxShip;
+        private StatusStrip statusStrip1;
+        private ToolStripStatusLabel toolStripStatusLabelSpeed;
+        private ToolStripStatusLabel toolStripStatusLabelWeight;
+        private ToolStripStatusLabel toolStripStatusLabelBodyColor;
+        private Button buttonCreate;
+        private Button buttonDown;
+        private Button buttonUp;
+        private Button buttonRight;
+        private Button buttonLeft;
+        private Button ButtonCreateModif;
+        private ComboBox ComboBoxSelectorMap;
+    }
+}

WarmlyShip/WarmlyShip/FormMap.cs

@@ -0,0 +1,93 @@
+namespace WarmlyShip
+{
+    public partial class FormMap : Form
+    {
+        private AbstractMap _abstractMap;
+
+        public FormMap()
+        {
+            InitializeComponent();
+            _abstractMap = new SimpleMap();
+        }
+        /// <summary>
+        /// Çàïîëíåíèå èíôîðìàöèè ïî îáúåêòó
+        /// </summary>
+        /// <param name="car"></param>
+        private void SetData(DrawningShip ship)
+        {
+            toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {ship.Ship.Speed}";
+            toolStripStatusLabelWeight.Text = $"Âåñ: {ship.Ship.Weight}";
+            toolStripStatusLabelBodyColor.Text = $"Öâåò: {ship.Ship.BodyColor.Name}";
+            pictureBoxShip.Image = _abstractMap.CreateMap(pictureBoxShip.Width, pictureBoxShip.Height,
+                new DrawningObjectShip(ship));
+        }
+ 
+        /// <summary>
+        /// Îáðàáîòêà íàæàòèÿ êíîïêè "Ñîçäàòü"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonCreate_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            var ship = new DrawningShip(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            SetData(ship);
+        }
+
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            //ïîëó÷àåì èìÿ êíîïêè
+            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;
+            }
+            pictureBoxShip.Image = _abstractMap?.MoveObject(dir);
+        }
+
+        /// <summary>
+        /// Îáðàáîòêà íàæàòèÿ êíîïêè "Ìîäèôèêàöèÿ"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreateModif_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            var ship = new DrawningWarmlyShip(rnd.Next(100, 300), rnd.Next(1000, 2000),
+                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
+                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
+                Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
+            SetData(ship);
+        }
+        /// <summary>
+        /// Ñìåíà êàðòû
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+       private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            switch (ComboBoxSelectorMap.Text)
+            {
+                case "Ïðîñòàÿ êàðòà":
+                        _abstractMap = new SimpleMap();
+                        break;
+
+                case "Îêåàí":
+                    _abstractMap = new OceanMap();
+                        break;
+            }
+        }
+    }
+}

WarmlyShip/WarmlyShip/FormMap.resx

@@ -0,0 +1,63 @@
+<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="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>

WarmlyShip/WarmlyShip/FormShip.Designer.cs

@@ -38,6 +38,7 @@
             this.buttonUp = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonLeft = new System.Windows.Forms.Button();
+            this.ButtonCreateModif = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).BeginInit();
             this.statusStrip1.SuspendLayout();
             this.SuspendLayout();
@@ -146,11 +147,23 @@
             this.buttonLeft.UseVisualStyleBackColor = true;
             this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
+            // 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(124, 369);
+            this.ButtonCreateModif.Name = "ButtonCreateModif";
+            this.ButtonCreateModif.Size = new System.Drawing.Size(120, 29);
+            this.ButtonCreateModif.TabIndex = 7;
+            this.ButtonCreateModif.Text = "Модификация";
+            this.ButtonCreateModif.UseVisualStyleBackColor = true;
+            this.ButtonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
+            // 
             // FormShip
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.ButtonCreateModif);
             this.Controls.Add(this.buttonLeft);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonUp);
@@ -180,5 +193,6 @@
         private Button buttonUp;
         private Button buttonRight;
         private Button buttonLeft;
+        private Button ButtonCreateModif;
     }
 }

WarmlyShip/WarmlyShip/FormShip.cs

@@ -2,11 +2,22 @@ namespace WarmlyShip
 {
     public partial class FormShip : Form
     {
-        private DrawningWarmlyShip _ship;
+        private DrawningShip _ship;
         public FormShip()
         {
             InitializeComponent();
         }
+        /// <summary>
+		/// Ìåòîä óñòàíîâêè äàííûõ
+		/// </summary>
+		private void SetData()
+        {
+            Random rnd = new();
+            _ship.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxShip.Width, pictureBoxShip.Height);
+            toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_ship.Ship.Speed}";
+            toolStripStatusLabelWeight.Text = $"Âåñ: {_ship.Ship.Weight}";
+            toolStripStatusLabelBodyColor.Text = $"Öâåò: {_ship.Ship.BodyColor.Name}";
+        }
         private void Draw()
         {
             Bitmap bmp = new(pictureBoxShip.Width, pictureBoxShip.Height);
@@ -22,12 +33,9 @@ namespace WarmlyShip
         private void buttonCreate_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            _ship = new DrawningWarmlyShip();
-            _ship.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            _ship = new DrawningShip(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
             _ship.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxShip.Width, pictureBoxShip.Height);
-            toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_ship.Ship.Speed}";
-            toolStripStatusLabelWeight.Text = $"Âåñ: {_ship.Ship.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Öâåò: {_ship.Ship.BodyColor.Name}";
+            SetData();
             Draw();
         }
 
@@ -52,5 +60,21 @@ namespace WarmlyShip
             }
             Draw();
         }
+
+        /// <summary>
+        /// Îáðàáîòêà íàæàòèÿ êíîïêè "Ìîäèôèêàöèÿ"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreateModif_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            _ship = new DrawningWarmlyShip(rnd.Next(100, 300), rnd.Next(1000, 2000),
+                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
+                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
+                Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
+            SetData();
+            Draw();
+        }
     }
 }

WarmlyShip/WarmlyShip/IDrawningObject.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+    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();
+	}
+}

WarmlyShip/WarmlyShip/OceanMap.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+    internal class OceanMap : AbstractMap
+    {
+        private readonly Brush barrierColor = new SolidBrush(Color.Gray);
+
+        private readonly Brush roadColor = new SolidBrush(Color.DeepSkyBlue);
+
+        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));
+            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 < 15)
+            {
+                int x = _random.Next(0, 95);
+                int y = _random.Next(0, 95);
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y + 1] = _barrier;
+                    _map[x, y + 2] = _barrier;
+                    _map[x + 1, y + 1] = _barrier;
+                    _map[x + 2, y + 1] = _barrier;
+                    _map[x + 1, y] = _barrier;
+                    _map[x + 2, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    }
+}

WarmlyShip/WarmlyShip/Program.cs

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

WarmlyShip/WarmlyShip/SimpleMap.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+    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 < 25)
+            {
+                int x = _random.Next(0, 100);
+                int y = _random.Next(0, 100);
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    }
+}

WarmlyShip/WarmlyShip/WarmlyShip.csproj

@@ -9,6 +9,9 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Update="FormMap.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>