PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/AbstractMap.cs

@@ -0,0 +1,133 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
+{
+    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 проверка, что объект может переместится в требуемом направлении
+            bool enoughPlace = false;
+            switch (direction)
+            {
+                case Direction.Up:
+                    enoughPlace = CheckEnoughPlace(0, _drawningObject.Step * -1);
+                    break;
+                case Direction.Down:
+                    enoughPlace = CheckEnoughPlace(0, _drawningObject.Step);
+                    break;
+                case Direction.Left:
+                    enoughPlace = CheckEnoughPlace(_drawningObject.Step * -1, 0);
+                    break;
+                case Direction.Right:
+                    enoughPlace = CheckEnoughPlace(_drawningObject.Step, 0);
+                    break;
+            }
+            if (enoughPlace)
+            {
+                _drawningObject.MoveObject(direction);
+            }
+            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 првоерка, что объект не "накладывается" на закрытые участки
+            while (!CheckEnoughPlace(0, 0))
+            {
+                x += 10;
+                if (x >= _width)
+                {
+                    if (y <= _height)
+                    {
+                        y += 10;
+                        x = 0;
+                    } else
+                    {
+                        return false;
+                    }
+                }
+                _drawningObject.SetObject(x, y, _width, _height);
+            }
+            return true;
+        }
+        private bool CheckEnoughPlace(float x, float y)
+        {
+            int right = Convert.ToInt32((_drawningObject.GetCurrentPosition().Right + x) / _size_x) > 0 ? Convert.ToInt32((_drawningObject.GetCurrentPosition().Right + x) / _size_x) : 0;
+            int left = Convert.ToInt32((_drawningObject.GetCurrentPosition().Left + x) / _size_x) > 0 ? Convert.ToInt32((_drawningObject.GetCurrentPosition().Left + x) / _size_x) : 0;
+            int up = Convert.ToInt32((_drawningObject.GetCurrentPosition().Top + y) / _size_y) > 0 ? Convert.ToInt32((_drawningObject.GetCurrentPosition().Top + y) / _size_y) : 0;
+            int down = Convert.ToInt32((_drawningObject.GetCurrentPosition().Bottom + y) / _size_y) > 0 ? Convert.ToInt32((_drawningObject.GetCurrentPosition().Bottom + y) / _size_y) : 0;
+            for (int i = left; i <= right; i++)
+            {
+                for (int j = up; j <= down; j++)
+                {
+                    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);
+    }
+}

PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/Direction.cs

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

PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningBoat.cs

@@ -11,15 +11,15 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
         /// <summary>
         /// Класс-сущность
         /// </summary>
-        public EntityBoat Boat { private set; get; }
+        public EntityBoat Boat { protected set; get; }
         /// <summary>
         /// Левая координата отрисовки автомобиля
         /// </summary>
-        private float _startPosX;
+        protected float _startPosX;
         /// <summary>
         /// Верхняя кооридната отрисовки автомобиля
         /// </summary>
-        private float _startPosY;
+        protected float _startPosY;
         /// <summary>
         /// Ширина окна отрисовки
         /// </summary>
@@ -42,12 +42,26 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
         /// <param name="speed">Скорость</param>
         /// <param name="weight">Вес автомобиля</param>
         /// <param name="bodyColor">Цвет кузова</param>
-        public void Init(int speed, float weight, Color bodyColor)
+        public DrawningBoat(int speed, float weight, Color bodyColor)
         {
-            Boat = new EntityBoat();
-            Boat.Init(speed, weight, bodyColor);
+            Boat = new EntityBoat(speed, weight, bodyColor);
         }
         /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес автомобиля</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        /// <param name="boatWidth">Ширина отрисовки автомобиля</param>
+        /// <param name="boatHeight">Высота отрисовки автомобиля</param>
+        protected DrawningBoat(int speed, float weight, Color bodyColor, int boatWidth, int boatHeight) :
+        this(speed, weight, bodyColor)
+        {
+            _boatWidth = boatWidth;
+            _boatHeight = boatHeight;
+        }
+        ///
+        /// <summary>
         /// Установка позиции автомобиля
         /// </summary>
         /// <param name="x">Координата X</param>
@@ -110,7 +124,7 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
         /// Отрисовка лодки
         /// </summary>
         /// <param name="g"></param>
-        public void DrawTransport(Graphics g)
+        public virtual void DrawTransport(Graphics g)
         {
             if (_startPosX < 0 || _startPosY < 0
             || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
@@ -119,7 +133,6 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
             }
             Pen pen = new(Color.Black, 3);
             Brush br = new SolidBrush(Boat?.BodyColor ?? Color.Black);
-            Brush brBrown = new SolidBrush(Color.Brown);
             // Внешняя часть лодки
             g.DrawLine(pen, _startPosX, _startPosY, _startPosX + 120, _startPosY + 0);
             g.DrawLine(pen, _startPosX + 120, _startPosY, _startPosX + 170, _startPosY + 30);
@@ -133,7 +146,7 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
             PointF pt5 = new PointF(_startPosX, _startPosY + 60);
             g.FillPolygon(br, new PointF[] { pt1, pt2, pt3, pt4, pt5});
             // Внутренняя часть лодки
-            g.FillEllipse(brBrown, _startPosX + 10, _startPosY + 10, 110, 40);
+            g.FillEllipse(new SolidBrush(Color.Brown), _startPosX + 10, _startPosY + 10, 110, 40);
         }
         /// <summary>
         /// Смена границ формы отрисовки
@@ -159,5 +172,9 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
                 _startPosY = _pictureHeight.Value - _boatHeight;
             }
         }
+        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+        {
+            return (_startPosX, _startPosX + _boatWidth, _startPosY, _startPosY + _boatHeight);
+        }
     }
 }

PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningObjectBoat.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
+{
+    internal class DrawningObjectBoat : IDrawningObject
+    {
+        private DrawningBoat _boat = null;
+        public DrawningObjectBoat(DrawningBoat boat)
+        {
+            _boat = boat;
+        }
+        public float Step => _boat?.Boat?.Step ?? 0;
+        public void DrawningObject(Graphics g)
+        {
+            _boat?.DrawTransport(g);
+        }
+        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);
+        }
+    }
+}

PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningSportBoat.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
+{
+    internal class DrawningSportBoat : DrawningBoat
+    {
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <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 DrawningSportBoat(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) :
+        base(speed, weight, bodyColor, 195, 80)
+        {
+            Boat = new EntitySportBoat(speed, weight, bodyColor, dopColor, bodyKit, wing, sportLine);
+        }
+        public override void DrawTransport(Graphics g)
+        {
+            if (Boat is not EntitySportBoat sportBoat)
+            {
+                return;
+            }
+            Pen pen = new(Color.Black);
+            Brush baseBrush = new SolidBrush(sportBoat?.BodyColor ?? Color.Black);
+            Brush dopBrush = new SolidBrush(sportBoat?.DopColor ?? Color.Black);
+            _startPosX += 25;
+            _startPosY += 10;
+            base.DrawTransport(g);
+            _startPosX -= 25;
+            _startPosY -= 10;
+            if (sportBoat.Wing)
+            {
+                g.FillRectangle(dopBrush, _startPosX, _startPosY, 20, 80);
+                g.DrawRectangle(pen, _startPosX, _startPosY, 20, 80);
+                g.FillRectangle(baseBrush, _startPosX + 20, _startPosY + 20, 10, 40);
+                g.DrawRectangle(pen, _startPosX + 20, _startPosY + 20, 10, 40);
+            }
+            _startPosX += 25;
+            _startPosY += 10;
+            if (sportBoat.BodyKit)
+            {
+                PointF pt1 = new PointF(_startPosX + 120, _startPosY + 10);
+                PointF pt2 = new PointF(_startPosX + 155, _startPosY + 30);
+                PointF pt3 = new PointF(_startPosX + 120, _startPosY + 50);
+                PointF pt4 = new PointF(_startPosX + 120, _startPosY + 45);
+                PointF pt5 = new PointF(_startPosX + 145, _startPosY + 30);
+                PointF pt6 = new PointF(_startPosX + 120, _startPosY + 15);
+                g.FillPolygon(dopBrush, new PointF[] { pt1, pt2, pt3, pt4, pt5, pt6 });
+            }
+            if (sportBoat.SportLine)
+            {
+                PointF pt1 = new PointF(_startPosX + 70, _startPosY);
+                PointF pt2 = new PointF(_startPosX + 80, _startPosY);
+                PointF pt3 = new PointF(_startPosX + 120, _startPosY + 60);
+                PointF pt4 = new PointF(_startPosX + 110, _startPosY + 60);
+                g.FillPolygon(dopBrush, new PointF[] { pt1, pt2, pt3, pt4 });
+                g.FillEllipse(new SolidBrush(Color.Brown), _startPosX + 10, _startPosY + 10, 110, 40);
+            }
+            _startPosX -= 25;
+            _startPosY -= 10;
+        }
+    }
+}

PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/EntityBoat.cs

@@ -12,7 +12,7 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
         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 EntityBoat(int speed, float weight, Color bodyColor)
         {
             Random rnd = new();
             Speed = speed <= 0 ? rnd.Next(5, 30) : speed;

PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/EntitySportBoat.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
+{
+    internal class EntitySportBoat : EntityBoat
+    {
+        /// <summary>
+        /// Дополнительный цвет
+        /// </summary>
+        public Color DopColor { get; private set; }
+        /// <summary>
+        /// Признак наличия обвеса
+        /// </summary>
+        public bool BodyKit { get; private set; }
+        /// <summary>
+        /// Признак наличия антикрыла
+        /// </summary>
+        public bool Wing { get; private set; }
+        /// <summary>
+        /// Признак наличия гоночной полосы
+        /// </summary>
+        public bool SportLine { get; private set; }
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <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 EntitySportBoat(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) :
+        base(speed, weight, bodyColor)
+        {
+            DopColor = dopColor;
+            BodyKit = bodyKit;
+            Wing = wing;
+            SportLine = sportLine;
+        }
+    }
+}

PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormBoat.Designer.cs

@@ -38,6 +38,7 @@
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonUp = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
+            this.buttonCreateModif = new System.Windows.Forms.Button();
             this.statusStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBoat)).BeginInit();
             this.SuspendLayout();
@@ -49,28 +50,29 @@
             this.toolStripStatusLabelSpeed,
             this.toolStripStatusLabelWeight,
             this.toolStripStatusLabelBodyColor});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 427);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 318);
             this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Size = new System.Drawing.Size(882, 26);
+            this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 12, 0);
+            this.statusStrip1.Size = new System.Drawing.Size(772, 22);
             this.statusStrip1.TabIndex = 0;
             this.statusStrip1.Text = "statusStrip1";
             // 
             // toolStripStatusLabelSpeed
             // 
             this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
-            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(76, 20);
+            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(62, 17);
             this.toolStripStatusLabelSpeed.Text = "Скорость:";
             // 
             // toolStripStatusLabelWeight
             // 
             this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
-            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(36, 20);
+            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(29, 17);
             this.toolStripStatusLabelWeight.Text = "Вес:";
             // 
             // toolStripStatusLabelBodyColor
             // 
             this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
-            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(45, 20);
+            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(36, 17);
             this.toolStripStatusLabelBodyColor.Text = "Цвет:";
             // 
             // pictureBoxBoat
@@ -78,8 +80,9 @@
             this.pictureBoxBoat.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.pictureBoxBoat.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pictureBoxBoat.Location = new System.Drawing.Point(0, 0);
+            this.pictureBoxBoat.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.pictureBoxBoat.Name = "pictureBoxBoat";
-            this.pictureBoxBoat.Size = new System.Drawing.Size(882, 427);
+            this.pictureBoxBoat.Size = new System.Drawing.Size(772, 318);
             this.pictureBoxBoat.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
             this.pictureBoxBoat.TabIndex = 1;
             this.pictureBoxBoat.TabStop = false;
@@ -89,9 +92,10 @@
             // 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, 385);
+            this.buttonCreate.Location = new System.Drawing.Point(10, 289);
+            this.buttonCreate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(94, 29);
+            this.buttonCreate.Size = new System.Drawing.Size(82, 22);
             this.buttonCreate.TabIndex = 2;
             this.buttonCreate.Text = "Создать";
             this.buttonCreate.UseVisualStyleBackColor = true;
@@ -102,9 +106,10 @@
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::PIbd_22_Kalyshev_Y_V_MotorBoat_Base.Properties.Resources.right;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonRight.Location = new System.Drawing.Point(820, 374);
+            this.buttonRight.Location = new System.Drawing.Point(718, 280);
+            this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(40, 40);
+            this.buttonRight.Size = new System.Drawing.Size(35, 30);
             this.buttonRight.TabIndex = 3;
             this.buttonRight.UseVisualStyleBackColor = true;
             this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -114,9 +119,10 @@
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::PIbd_22_Kalyshev_Y_V_MotorBoat_Base.Properties.Resources.left;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonLeft.Location = new System.Drawing.Point(728, 374);
+            this.buttonLeft.Location = new System.Drawing.Point(637, 280);
+            this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(40, 40);
+            this.buttonLeft.Size = new System.Drawing.Size(35, 30);
             this.buttonLeft.TabIndex = 4;
             this.buttonLeft.UseVisualStyleBackColor = true;
             this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -126,9 +132,10 @@
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::PIbd_22_Kalyshev_Y_V_MotorBoat_Base.Properties.Resources.up;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonUp.Location = new System.Drawing.Point(774, 328);
+            this.buttonUp.Location = new System.Drawing.Point(677, 246);
+            this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(40, 40);
+            this.buttonUp.Size = new System.Drawing.Size(35, 30);
             this.buttonUp.TabIndex = 5;
             this.buttonUp.UseVisualStyleBackColor = true;
             this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
@@ -138,18 +145,31 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::PIbd_22_Kalyshev_Y_V_MotorBoat_Base.Properties.Resources.down;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.buttonDown.Location = new System.Drawing.Point(774, 374);
+            this.buttonDown.Location = new System.Drawing.Point(677, 280);
+            this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(40, 40);
+            this.buttonDown.Size = new System.Drawing.Size(35, 30);
             this.buttonDown.TabIndex = 6;
             this.buttonDown.UseVisualStyleBackColor = true;
             this.buttonDown.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(98, 289);
+            this.buttonCreateModif.Name = "buttonCreateModif";
+            this.buttonCreateModif.Size = new System.Drawing.Size(99, 22);
+            this.buttonCreateModif.TabIndex = 7;
+            this.buttonCreateModif.Text = "Модификация";
+            this.buttonCreateModif.UseVisualStyleBackColor = true;
+            this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click);
+            // 
             // FormBoat
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(882, 453);
+            this.ClientSize = new System.Drawing.Size(772, 340);
+            this.Controls.Add(this.buttonCreateModif);
             this.Controls.Add(this.buttonDown);
             this.Controls.Add(this.buttonUp);
             this.Controls.Add(this.buttonLeft);
@@ -157,6 +177,7 @@
             this.Controls.Add(this.buttonCreate);
             this.Controls.Add(this.pictureBoxBoat);
             this.Controls.Add(this.statusStrip1);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "FormBoat";
             this.Text = "Лодка";
             this.statusStrip1.ResumeLayout(false);
@@ -179,5 +200,6 @@
         private Button buttonLeft;
         private Button buttonUp;
         private Button buttonDown;
+        private Button buttonCreateModif;
     }
 }

PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormBoat.cs

@@ -18,6 +18,17 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base.git
             _boat?.DrawTransport(gr);
             pictureBoxBoat.Image = bmp;
         }
+        /// <summary>
+		/// Ìåòîä óñòàíîâêè äàííûõ
+		/// </summary>
+		private void SetData()
+        {
+            Random rnd = new Random();
+            _boat.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxBoat.Width, pictureBoxBoat.Height);
+            toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_boat.Boat.Speed}";
+            toolStripStatusLabelWeight.Text = $"Âåñ: {_boat.Boat.Weight}";
+            toolStripStatusLabelBodyColor.Text = $"Öâåò: {_boat.Boat.BodyColor.Name}";
+        }
         /// <summary>
         /// Îáðàáîòêà íàæàòèÿ êíîïêè "Ñîçäàòü"
         /// </summary>
@@ -26,12 +37,8 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base.git
         private void ButtonCreate_Click(object sender, EventArgs e)
         {
            Random rnd = new();
-            _boat = new DrawningBoat();
-            _boat.Init(rnd.Next(5, 30), rnd.Next(30, 100), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            _boat.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxBoat.Width, pictureBoxBoat.Height);
-            toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_boat.Boat.Speed}";
-            toolStripStatusLabelWeight.Text = $"Âåñ: {_boat.Boat.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Öâåò: {_boat.Boat.BodyColor.Name}";
+            _boat = new DrawningBoat(rnd.Next(5, 30), rnd.Next(30, 100), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            SetData();
             Draw();
         }
         /// <summary>
@@ -70,5 +77,17 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base.git
             _boat?.ChangeBorders(pictureBoxBoat.Width, pictureBoxBoat.Height);
             Draw();
         }
+        /// <summary>
+        /// Îáðàáîòêà íàæàòèÿ êíîïêè "Ìîäèôèêàöèÿ"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonCreateModif_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            _boat = new DrawningSportBoat(rnd.Next(5, 30), rnd.Next(30, 100), 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)), Convert.ToBoolean(rnd.Next(0, 2)));
+            SetData();
+            Draw();
+        }
     }
 }

PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.Designer.cs

@@ -0,0 +1,214 @@
+namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
+{
+    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.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.pictureBoxBoat = new System.Windows.Forms.PictureBox();
+            this.buttonCreate = 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.buttonDown = new System.Windows.Forms.Button();
+            this.buttonCreateModif = new System.Windows.Forms.Button();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            this.statusStrip1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBoat)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // 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, 427);
+            this.statusStrip1.Name = "statusStrip1";
+            this.statusStrip1.Size = new System.Drawing.Size(882, 26);
+            this.statusStrip1.TabIndex = 0;
+            this.statusStrip1.Text = "statusStrip1";
+            // 
+            // toolStripStatusLabelSpeed
+            // 
+            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
+            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(76, 20);
+            this.toolStripStatusLabelSpeed.Text = "Скорость:";
+            // 
+            // toolStripStatusLabelWeight
+            // 
+            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
+            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(36, 20);
+            this.toolStripStatusLabelWeight.Text = "Вес:";
+            // 
+            // toolStripStatusLabelBodyColor
+            // 
+            this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
+            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(45, 20);
+            this.toolStripStatusLabelBodyColor.Text = "Цвет:";
+            // 
+            // pictureBoxBoat
+            // 
+            this.pictureBoxBoat.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+            this.pictureBoxBoat.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pictureBoxBoat.Location = new System.Drawing.Point(0, 0);
+            this.pictureBoxBoat.Name = "pictureBoxBoat";
+            this.pictureBoxBoat.Size = new System.Drawing.Size(882, 427);
+            this.pictureBoxBoat.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+            this.pictureBoxBoat.TabIndex = 1;
+            this.pictureBoxBoat.TabStop = false;
+            // 
+            // 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(11, 385);
+            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);
+            // 
+            // buttonRight
+            // 
+            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonRight.BackgroundImage = global::PIbd_22_Kalyshev_Y_V_MotorBoat_Base.Properties.Resources.right;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.buttonRight.Location = new System.Drawing.Point(821, 373);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(40, 40);
+            this.buttonRight.TabIndex = 3;
+            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::PIbd_22_Kalyshev_Y_V_MotorBoat_Base.Properties.Resources.left;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.buttonLeft.Location = new System.Drawing.Point(728, 373);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(40, 40);
+            this.buttonLeft.TabIndex = 4;
+            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::PIbd_22_Kalyshev_Y_V_MotorBoat_Base.Properties.Resources.up;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.buttonUp.Location = new System.Drawing.Point(774, 328);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(40, 40);
+            this.buttonUp.TabIndex = 5;
+            this.buttonUp.UseVisualStyleBackColor = true;
+            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonDown
+            // 
+            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonDown.BackgroundImage = global::PIbd_22_Kalyshev_Y_V_MotorBoat_Base.Properties.Resources.down;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.buttonDown.Location = new System.Drawing.Point(774, 373);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(40, 40);
+            this.buttonDown.TabIndex = 6;
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.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(112, 385);
+            this.buttonCreateModif.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonCreateModif.Name = "buttonCreateModif";
+            this.buttonCreateModif.Size = new System.Drawing.Size(113, 29);
+            this.buttonCreateModif.TabIndex = 7;
+            this.buttonCreateModif.Text = "Модификация";
+            this.buttonCreateModif.UseVisualStyleBackColor = true;
+            this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_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(11, 16);
+            this.comboBoxSelectorMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(130, 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(882, 453);
+            this.Controls.Add(this.comboBoxSelectorMap);
+            this.Controls.Add(this.buttonCreateModif);
+            this.Controls.Add(this.buttonDown);
+            this.Controls.Add(this.buttonUp);
+            this.Controls.Add(this.buttonLeft);
+            this.Controls.Add(this.buttonRight);
+            this.Controls.Add(this.buttonCreate);
+            this.Controls.Add(this.pictureBoxBoat);
+            this.Controls.Add(this.statusStrip1);
+            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.Name = "FormMap";
+            this.Text = "Карта";
+            this.statusStrip1.ResumeLayout(false);
+            this.statusStrip1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBoat)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private StatusStrip statusStrip1;
+        private ToolStripStatusLabel toolStripStatusLabelSpeed;
+        private ToolStripStatusLabel toolStripStatusLabelWeight;
+        private ToolStripStatusLabel toolStripStatusLabelBodyColor;
+        private PictureBox pictureBoxBoat;
+        private Button buttonCreate;
+        private Button buttonRight;
+        private Button buttonLeft;
+        private Button buttonUp;
+        private Button buttonDown;
+        private Button buttonCreateModif;
+        private ComboBox comboBoxSelectorMap;
+    }
+}

PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.cs

@@ -0,0 +1,102 @@
+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 PIbd_22_Kalyshev_Y_V_MotorBoat_Base
+{
+    public partial class FormMap : Form
+    {
+        private AbstractMap _abstractMap;
+        public FormMap()
+        {
+            InitializeComponent();
+            _abstractMap = new SimpleMap();
+        }
+        /// <summary>
+        /// Заполнение информации по объекту
+        /// </summary>
+        /// <param name="car"></param>
+        private void SetData(DrawningBoat boat)
+        {
+            toolStripStatusLabelSpeed.Text = $"Скорость: {boat.Boat.Speed}";
+            toolStripStatusLabelWeight.Text = $"Вес: {boat.Boat.Weight}";
+            toolStripStatusLabelBodyColor.Text = $"Цвет: {boat.Boat.BodyColor.Name}";
+            pictureBoxBoat.Image = _abstractMap.CreateMap(pictureBoxBoat.Width, pictureBoxBoat.Height, new DrawningObjectBoat(boat));
+        }
+        /// <summary>
+        /// Обработка нажатия кнопки "Создать"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreate_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            var boat = new DrawningBoat(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            SetData(boat);
+        }
+        /// <summary>
+        /// Изменение размеров формы
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        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;
+            }
+            pictureBoxBoat.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 boat = new DrawningSportBoat(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)), Convert.ToBoolean(rnd.Next(0, 2)));
+            SetData(boat);
+        }
+        /// <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 MySecondMap();
+                    break;
+            }
+        }
+    }
+}

PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/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>

PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/IDrawningObject.cs

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

PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/MySecondMap.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
+{
+    internal class MySecondMap : AbstractMap
+    {
+        /// <summary>
+        /// Цвет участка закрытого
+        /// </summary>
+        private readonly Brush barrierColor = new SolidBrush(Color.Red);
+        /// <summary>
+        /// Цвет участка открытого
+        /// </summary>
+        private readonly Brush roadColor = new SolidBrush(Color.FromArgb(242, 242, 242));
+        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[150, 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 < 10)
+            {
+                int x = _random.Next(0, _map.GetLength(0));
+                int y = _random.Next(0, _map.GetLength(1));
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    }
+}

PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/Program.cs

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

PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/SimpleMap.cs

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