Warship/Warship/AbstractMap.cs

@@ -1,152 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Warship
-{
-    internal abstract class AbstractMap
-    {
-        private IDrawingObject _drawingObject = 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 _freeWaterArea = 0;
-        protected readonly int _land = 1;
-
-        public Bitmap CreateMap(int width,int height,IDrawingObject drawingObject)
-        {
-            _width = width;
-            _height = height;
-            _drawingObject = drawingObject;
-            GenerateMap();
-            while (!SetObjectOnMap())
-            {
-                GenerateMap();
-            }
-            return DrawMapWithObject();
-        }
-
-        public Bitmap MoveObject(Direction direction)
-        {
-            (float Left, float Right, float Top, float Bottom) = _drawingObject.GetCurrentPosition();
-
-            if (CheckLand(Left, Right, Top, Bottom) != 0)
-            {
-                _drawingObject.MoveObject(SetOppositDirection(direction));
-            }
-
-            if (true)
-            {
-                _drawingObject.MoveObject(direction);
-            }
-            return DrawMapWithObject();
-        }
-
-        private bool SetObjectOnMap()
-        {
-            if (_drawingObject==null || _map == null)
-            {
-                return false;
-            }
-            int x = _random.Next(0, 10);
-            int y = _random.Next(0, 10);
-            _drawingObject.SetObject(x, y, _width, _height);
-
-            (float Left, float Right, float Top, float Bottom) = _drawingObject.GetCurrentPosition();
-
-            while (CheckLand(Left, Right, Top, Bottom) != 2)
-            {
-                int res;
-                do
-                {
-                    res = CheckLand(Left, Right, Top, Bottom);
-                    if (res == 0)
-                    {
-                        _drawingObject.SetObject((int)Left, (int)Right, _width, _height);
-                        return true;
-                    }
-                    else
-                    {
-                        Left += _size_x;
-                    }
-                } while (res != 2);
-                Left = x;
-                Right += _size_y;
-            }
-            return false;
-        }
-
-        private Bitmap DrawMapWithObject()
-        {
-            Bitmap bmp = new(_width, _height);
-            if (_drawingObject == 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] == _freeWaterArea)
-                    {
-                        DrawWaterPart(gr, i, j);
-                    }
-                    else if (_map[i, j] == _land)
-                    {
-                        DrawLandPart(gr, i, j);
-                    }
-                }
-            }
-            _drawingObject.DrawingObject(gr);
-            return bmp;
-        }
-        private int CheckLand(float Left, float Right, float Top, float Bottom)
-        {
-            int RUi = (int)(Left / _size_x);
-            int RUj = (int)(Right / _size_y);
-            int LDi = (int)(Top / _size_x);
-            int LDj = (int)(Bottom / _size_y);
-
-            if (RUi < 0 || RUj < 0 || LDi >= _map.GetLength(1) || LDj >= _map.GetLength(0))
-            {
-                return -1;
-            }
-            for (int x = RUi; x <= LDi; x++)
-            {
-                for (int y = RUj; y <= LDj; y++)
-                {
-                    if (_map[x, y] == _land)
-                    {
-                        return 1;
-                    }
-                }
-            }
-            return 0;
-        }
-        private Direction SetOppositDirection(Direction dir)
-        {
-            switch (dir)
-            {
-                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;
-        }
-
-        protected abstract void GenerateMap();
-        protected abstract void DrawWaterPart(Graphics gr, int i, int j);
-        protected abstract void DrawLandPart(Graphics gr, int i, int j);
-    }
-}

Warship/Warship/Direction.cs

@@ -8,10 +8,9 @@ namespace Warship
 {
     internal enum Direction
     {
-        None=0,
         Up=1,
         Down=2,
         Left=3,
-        Right=4,
+        Right=4
     }
 }

Warship/Warship/DrawingAdvancedWarship.cs

@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Warship
-{
-    internal class DrawingAdvancedWarship : DrawingWarship
-    {
-        public DrawingAdvancedWarship(int speed,float weight, Color bodyColor, Color dopColor, bool Helipad, bool Antenna, bool Missile) : base(speed, weight, bodyColor, 120, 50)
-        {
-            Warship = new EntityAdvancedWarship(speed, weight, bodyColor, dopColor, Helipad, Antenna, Missile);
-        }
-
-        public override void DrawTransport(Graphics g)
-        {
-            if (Warship is not EntityAdvancedWarship advancedWarship)
-            {
-                return;
-            }
-
-            Pen pen = new(Color.Black);
-            Brush dopBrush = new SolidBrush(advancedWarship.DopColor);
-
-            if (advancedWarship.Missile)
-            {
-                g.FillPolygon(dopBrush, new Point[]
-            {
-                new Point(_startPosX+25,_startPosY+5-5),new Point(_startPosX+65,_startPosY+5-5),
-                new Point(_startPosX+75,_startPosY+10-5),new Point(_startPosX+25,_startPosY+10-5),
-                new Point(_startPosX+25,_startPosY+5-5)
-            }
-            );
-                g.DrawLine(pen, new Point(_startPosX + 25, _startPosY + 5 - 5), new Point(_startPosX + 65, _startPosY + 5 - 5));
-                g.DrawLine(pen, new Point(_startPosX + 65, _startPosY + 5 - 5), new Point(_startPosX + 75, _startPosY + 10 - 5));
-                g.DrawLine(pen, new Point(_startPosX + 75, _startPosY + 10 - 5), new Point(_startPosX + 25, _startPosY + 10 - 5));
-                g.DrawLine(pen, new Point(_startPosX + 25, _startPosY + 10 - 5), new Point(_startPosX + 25, _startPosY + 5 - 5));
-
-                g.FillPolygon(dopBrush, new Point[]
-            {
-                new Point(_startPosX+25,_startPosY+50-5),new Point(_startPosX+75,_startPosY+50-5),
-                new Point(_startPosX+65,_startPosY+55-5),new Point(_startPosX+25,_startPosY+55-5),
-                new Point(_startPosX+25,_startPosY+50-5)
-            }
-            );
-                g.DrawLine(pen, new Point(_startPosX + 25, _startPosY + 50 - 5), new Point(_startPosX + 75, _startPosY + 50 - 5));
-                g.DrawLine(pen, new Point(_startPosX + 75, _startPosY + 50 - 5), new Point(_startPosX + 65, _startPosY + 55 - 5));
-                g.DrawLine(pen, new Point(_startPosX + 65, _startPosY + 55 - 5), new Point(_startPosX + 25, _startPosY + 55 - 5));
-                g.DrawLine(pen, new Point(_startPosX + 25, _startPosY + 55 - 5), new Point(_startPosX + 25, _startPosY + 50 - 5));
-            }
-            _startPosY += 5;
-            base.DrawTransport(g);
-            _startPosY -= 5;
-
-            if (advancedWarship.Helipad)
-            {
-                g.FillEllipse(dopBrush, _startPosX + 85, _startPosY + 20-5, 20, 20);
-                g.DrawEllipse(pen, _startPosX + 85, _startPosY + 20-5, 20, 20);
-                g.DrawLine(pen, _startPosX + 90, _startPosY + 25 - 5, _startPosX + 90, _startPosY + 35 - 5);
-                g.DrawLine(pen, _startPosX + 90+10, _startPosY + 25 - 5, _startPosX + 90+10, _startPosY + 35 - 5);
-                g.DrawLine(pen, _startPosX + 90, _startPosY + 30 - 5, _startPosX + 100, _startPosY + 30 - 5);
-            }
-            if (advancedWarship.Antenna)
-            {
-                g.DrawLine(pen, _startPosX + 15, _startPosY + 20 - 5, _startPosX + 15, _startPosY + 40 - 5);
-                g.DrawLine(pen, _startPosX +10, _startPosY + 30 - 5, _startPosX + 20, _startPosY + 30 - 5);
-            }
-        }
-    }
-}

Warship/Warship/DrawingObjectWarship.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Warship
-{
-    internal class DrawingObjectWarship : IDrawingObject
-    {
-        private DrawingWarship _warship=null;
-
-        public DrawingObjectWarship(DrawingWarship warship)
-        {
-            _warship= warship;
-        }
-        public float Step => _warship?.Warship?.Step ?? 0;
-
-        void IDrawingObject.DrawingObject(Graphics g)
-        {
-            _warship.DrawTransport(g);
-        }
-
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return _warship?.GetCurrentPosition() ?? default;
-        }
-
-        public void MoveObject(Direction direction)
-        {
-            _warship?.MoveTransport(direction);
-        }
-
-        public void SetObject(int x, int y, int width, int height)
-        {
-            _warship.SetPosition(x,y,width,height);
-        }
-    }
-}

Warship/Warship/DrawingWarship.cs

@@ -8,26 +8,20 @@ namespace Warship
 {
     internal class DrawingWarship
     {
-        public EntityWarship Warship { get; protected set; }
+        public EntityWarship Warship { get; private set; }
-        protected int _startPosX;
+        private int _startPosX;
-        protected int _startPosY;
+        private int _startPosY;
         private int? _pictureWidth = null;
         private int? _pictureHeight = null;
         private readonly int _warshipWidth = 120;
         private readonly int _warshipHeight = 40;
 
-        public DrawingWarship(int speed, float weight, Color bodyColor)
+        public void Init(int speed, float weight,Color bodyColor)
         {
-            Warship=new EntityWarship(speed, weight, bodyColor);
+            Warship = new EntityWarship();
+            Warship.Init(speed, weight, bodyColor);
         }
 
-        protected DrawingWarship(int speed, float weight,Color bodyColor, int warshipWidth, int warshipHeight) : this(speed,weight,bodyColor)
-        {
-            _warshipWidth = warshipWidth;
-            _warshipHeight = warshipHeight;
-        }
-
-
         public void SetPosition(int x, int y, int width, int height)
         {
             if (x >= 0 && x+_warshipWidth <= width && y >= 0 && y+_warshipHeight <= height)
@@ -78,7 +72,7 @@ namespace Warship
             }
         }
 
-        public virtual void DrawTransport(Graphics g)
+        public void DrawTransport(Graphics g)
         {
             if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
             {
@@ -140,9 +134,5 @@ namespace Warship
                 _startPosY = _pictureHeight.Value - _warshipHeight;
             }
         }
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return (_startPosX, _startPosY, _startPosX + _warshipWidth, _startPosY + _warshipHeight);
-        }
     }
 }

Warship/Warship/EntityAdvancedWarship.cs

@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Warship
-{
-    internal class EntityAdvancedWarship : EntityWarship
-    {
-        public Color DopColor { get; private set; }
-        public bool Helipad { get;private set; }
-        public bool Antenna { get; private set; }
-        public bool Missile { get; private set; }
-        public EntityAdvancedWarship(int speed, float weight, Color bodyColor, Color dopColor, bool helipad, bool antenna, bool missile) : base(speed,weight,bodyColor) {
-            DopColor = dopColor;
-            Helipad = helipad;
-            Antenna = antenna;
-            Missile = missile;
-        }
-
-    }
-}

Warship/Warship/EntityWarship.cs

@@ -13,7 +13,7 @@ namespace Warship
         public Color BodyColor { get; private set; }
         public int Step => (int)(Speed * 2000 / Weight);
 
-        public EntityWarship(int speed, float weight, Color bodyColor)
+        public void Init(int speed, float weight, Color bodyColor)
         {
             Random rnd = new();
             Speed = speed <= 0 ? rnd.Next(10, 60) : speed;

Warship/Warship/FormMap.Designer.cs

@@ -1,211 +0,0 @@
-namespace Warship
-{
-    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.pictureBoxWarship = new System.Windows.Forms.PictureBox();
-            this.statusStrip = 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.pictureBoxWarship)).BeginInit();
-            this.statusStrip.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // pictureBoxWarship
-            // 
-            this.pictureBoxWarship.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBoxWarship.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxWarship.Name = "pictureBoxWarship";
-            this.pictureBoxWarship.Size = new System.Drawing.Size(800, 428);
-            this.pictureBoxWarship.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBoxWarship.TabIndex = 0;
-            this.pictureBoxWarship.TabStop = false;
-            // 
-            // statusStrip
-            // 
-            this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripStatusLabelSpeed,
-            this.toolStripStatusLabelWeight,
-            this.toolStripStatusLabelBodyColor});
-            this.statusStrip.Location = new System.Drawing.Point(0, 428);
-            this.statusStrip.Name = "statusStrip";
-            this.statusStrip.Size = new System.Drawing.Size(800, 22);
-            this.statusStrip.TabIndex = 1;
-            // 
-            // toolStripStatusLabelSpeed
-            // 
-            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
-            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(62, 17);
-            this.toolStripStatusLabelSpeed.Text = "Скорость:";
-            // 
-            // toolStripStatusLabelWeight
-            // 
-            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
-            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(29, 17);
-            this.toolStripStatusLabelWeight.Text = "Вес:";
-            // 
-            // toolStripStatusLabelBodyColor
-            // 
-            this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
-            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(36, 17);
-            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, 393);
-            this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(75, 23);
-            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::Warship.Properties.Resources.arrowDown;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(716, 386);
-            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::Warship.Properties.Resources.arrowUp;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(716, 314);
-            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::Warship.Properties.Resources.arrowRight;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(752, 350);
-            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::Warship.Properties.Resources.arrowLeft;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(680, 350);
-            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.Location = new System.Drawing.Point(93, 393);
-            this.buttonCreateModif.Name = "buttonCreateModif";
-            this.buttonCreateModif.Size = new System.Drawing.Size(110, 23);
-            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(667, 12);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(121, 23);
-            this.comboBoxSelectorMap.TabIndex = 8;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
-            // 
-            // FormMap
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.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.pictureBoxWarship);
-            this.Controls.Add(this.statusStrip);
-            this.Name = "FormMap";
-            this.Text = "Военный корабль";
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWarship)).EndInit();
-            this.statusStrip.ResumeLayout(false);
-            this.statusStrip.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private PictureBox pictureBoxWarship;
-        private StatusStrip statusStrip;
-        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;
-    }
-}

Warship/Warship/FormMap.cs

@@ -1,78 +0,0 @@
-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 Warship
-{
-    public partial class FormMap : Form
-    {
-        private AbstractMap _abstractMap;
-        public FormMap()
-        {
-            InitializeComponent();
-            _abstractMap = new SimpleMap();
-        }
-
-        private void SetData(DrawingWarship warship)
-        {
-            toolStripStatusLabelSpeed.Text = $"Cкорость: {warship.Warship.Speed}";
-            toolStripStatusLabelWeight.Text = $"Вес: {warship.Warship.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Цвет: {warship.Warship.BodyColor.Name}";
-            pictureBoxWarship.Image = _abstractMap.CreateMap(pictureBoxWarship.Width, pictureBoxWarship.Height, new DrawingObjectWarship(warship));
-        }
-
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var warship = new DrawingWarship(rnd.Next(10, 60), rnd.Next(20000, 25000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            SetData(warship);
-            
-        }
-        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;
-            }
-            pictureBoxWarship.Image = _abstractMap?.MoveObject(dir);
-        }
-        private void ButtonCreateModif_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var warship = new DrawingAdvancedWarship(rnd.Next(10, 60), rnd.Next(20000, 25000), 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(warship);
-        }
-
-        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            switch (comboBoxSelectorMap.Text)
-            {
-                case "Простая карта":
-                    _abstractMap = new SimpleMap();
-                    break;
-                case "Вторая карта":
-                    _abstractMap = new SecondMap();
-                    break;
-            }
-        }
-    }
-}

Warship/Warship/FormMap.resx

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

Warship/Warship/FormWarship.Designer.cs

@@ -38,7 +38,6 @@
             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.pictureBoxWarship)).BeginInit();
             this.statusStrip.SuspendLayout();
             this.SuspendLayout();
@@ -52,7 +51,7 @@
             this.pictureBoxWarship.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
             this.pictureBoxWarship.TabIndex = 0;
             this.pictureBoxWarship.TabStop = false;
-            this.pictureBoxWarship.Resize += new System.EventHandler(this.PictureBoxWarship_Resize);
+            this.pictureBoxWarship.Resize += new System.EventHandler(this.pictureBoxWarship_Resize);
             // 
             // statusStrip
             // 
@@ -92,7 +91,7 @@
             this.buttonCreate.TabIndex = 2;
             this.buttonCreate.Text = "Создать";
             this.buttonCreate.UseVisualStyleBackColor = true;
-            this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click);
+            this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click);
             // 
             // buttonDown
             // 
@@ -105,7 +104,7 @@
             this.buttonDown.TabIndex = 3;
             this.buttonDown.Text = " ";
             this.buttonDown.UseVisualStyleBackColor = true;
-            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
+            this.buttonDown.Click += new System.EventHandler(this.buttonMove_Click);
             // 
             // buttonUp
             // 
@@ -118,7 +117,7 @@
             this.buttonUp.TabIndex = 4;
             this.buttonUp.Text = " ";
             this.buttonUp.UseVisualStyleBackColor = true;
-            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+            this.buttonUp.Click += new System.EventHandler(this.buttonMove_Click);
             // 
             // buttonRight
             // 
@@ -131,7 +130,7 @@
             this.buttonRight.TabIndex = 5;
             this.buttonRight.Text = " ";
             this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+            this.buttonRight.Click += new System.EventHandler(this.buttonMove_Click);
             // 
             // buttonLeft
             // 
@@ -144,24 +143,13 @@
             this.buttonLeft.TabIndex = 6;
             this.buttonLeft.Text = " ";
             this.buttonLeft.UseVisualStyleBackColor = true;
-            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
+            this.buttonLeft.Click += new System.EventHandler(this.buttonMove_Click);
-            // 
-            // buttonCreateModif
-            // 
-            this.buttonCreateModif.Location = new System.Drawing.Point(93, 393);
-            this.buttonCreateModif.Name = "buttonCreateModif";
-            this.buttonCreateModif.Size = new System.Drawing.Size(110, 23);
-            this.buttonCreateModif.TabIndex = 7;
-            this.buttonCreateModif.Text = "Модификация";
-            this.buttonCreateModif.UseVisualStyleBackColor = true;
-            this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
             // 
             // FormWarship
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.buttonCreateModif);
             this.Controls.Add(this.buttonLeft);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonUp);
@@ -191,6 +179,5 @@
         private Button buttonUp;
         private Button buttonRight;
         private Button buttonLeft;
-        private Button buttonCreateModif;
     }
 }

Warship/Warship/FormWarship.cs

@@ -15,23 +15,18 @@ namespace Warship
             pictureBoxWarship.Image = bmp;
         }
 
-        private void SetData()
+        private void buttonCreate_Click(object sender, EventArgs e)
         {
             Random rnd = new();
+            _warship = new DrawingWarship();
+            _warship.Init(rnd.Next(10, 60), rnd.Next(20000, 25000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
             _warship.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxWarship.Width, pictureBoxWarship.Height);
             toolStripStatusLabelSpeed.Text = $"Cêîðîñòü: {_warship.Warship.Speed}";
             toolStripStatusLabelWeight.Text = $"Âåñ: {_warship.Warship.Weight}";
             toolStripStatusLabelBodyColor.Text = $"Öâåò: {_warship.Warship.BodyColor.Name}";
-        }
-
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            _warship = new DrawingWarship(rnd.Next(10, 60), rnd.Next(20000, 25000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            SetData();
             Draw();
         }
-        private void ButtonMove_Click(object sender, EventArgs e)
+        private void buttonMove_Click(object sender, EventArgs e)
         {
             string name = ((Button)sender)?.Name ?? string.Empty;
             switch (name)
@@ -52,18 +47,10 @@ namespace Warship
             Draw();
         }
 
-        private void PictureBoxWarship_Resize(object sender, EventArgs e)
+        private void pictureBoxWarship_Resize(object sender, EventArgs e)
         {
             _warship?.ChangeBorders(pictureBoxWarship.Width, pictureBoxWarship.Height);
             Draw();
         }
-
-        private void ButtonCreateModif_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            _warship = new DrawingAdvancedWarship(rnd.Next(10, 60), rnd.Next(20000, 25000), 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();
-        }
     }
 }

Warship/Warship/IDrawingObject.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Warship
-{
-    internal interface IDrawingObject
-    {
-        public float Step { get; }
-        void SetObject(int x, int y, int width, int height);
-        void MoveObject(Direction direction);
-        void DrawingObject(Graphics g);
-        (float Left, float Right, float Top, float Bottom) GetCurrentPosition();
-    }
-}

Warship/Warship/Program.cs

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

Warship/Warship/SecondMap.cs

@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Warship
-{
-    internal class SecondMap : AbstractMap
-    {
-        private readonly Brush waterColor = new SolidBrush(Color.White);
-        private readonly Brush landColor = new SolidBrush(Color.Black);
-        protected override void DrawLandPart(Graphics gr, int i, int j)
-        {
-            gr.FillRectangle(landColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
-        }
-
-        protected override void DrawWaterPart(Graphics gr, int i, int j)
-        {
-            gr.FillRectangle(waterColor, 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] = _freeWaterArea;
-                }
-            }
-            while (counter < 20)
-            {
-                int x = _random.Next(0, 100);
-                int y = _random.Next(0, 100);
-                if (_map[x, y] == _freeWaterArea)
-                {
-                    _map[x, y] = _land;
-                    counter++;
-                }
-            }
-        }
-    }
-}

Warship/Warship/SimpleMap.cs

@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Warship
-{
-    internal class SimpleMap : AbstractMap
-    {
-        private readonly Brush waterColor = new SolidBrush(Color.Blue);
-        private readonly Brush landColor = new SolidBrush(Color.Brown);
-        protected override void DrawLandPart(Graphics gr, int i, int j)
-        {
-            gr.FillRectangle(landColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
-        }
-
-        protected override void DrawWaterPart(Graphics gr, int i, int j)
-        {
-            gr.FillRectangle(waterColor, 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] = _freeWaterArea;
-                }
-            }
-            while (counter < 50)
-            {
-                int x = _random.Next(0, 100);
-                int y = _random.Next(0, 100);
-                if (_map[x, y] == _freeWaterArea)
-                {
-                    _map[x, y] = _land;
-                    counter++;
-                }
-            }
-        }
-    }
-}