Merge pull request 'Bondarenko M.S. Lab Work 3' (#8) from LabWork_03 into LabWork_02

Reviewed-on: http://student.git.athene.tech/maxnes3/PIbd-22_Bondarenko_M.S._WarmlyShip_Base/pulls/8

WarmlyShip/WarmlyShip/AbstractMap.cs

@@ -0,0 +1,121 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal abstract class AbstractMap
+	{
+		private IDrawningObject _drawningObject = null;
+
+		protected int[,] _map = null;
+		protected int _width;
+		protected int _height;
+		protected float _size_x;
+		protected float _size_y;
+		protected readonly Random _random = new();
+		protected readonly int _freeRoad = 0;
+		protected readonly int _barrier = 1;
+
+		public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject)
+		{
+			_width = width;
+			_height = height;
+			_drawningObject = drawningObject;
+			GenerateMap();
+			while (!SetObjectOnMap())
+			{
+				GenerateMap();
+			}
+			return DrawMapWithObject();
+		}
+
+		private bool CanMove(Direction direction, (float Left, float Right, float Top, float Bottom) position) //Проверка на возможность шага
+		{
+			for (int i = (int)(position.Top / _size_y); i <= (int)(position.Bottom / _size_y); ++i)
+			{
+				for (int j = (int)(position.Left / _size_x); j <= (int)(position.Right / _size_x); ++j)
+				{
+					if (i >= 0 && j >= 0 && i < _map.GetLength(0) && j < _map.GetLength(1) && _map[i, j] == _barrier) return false;
+				}
+			}
+			return true;
+		}
+
+		public Bitmap MoveObject(Direction direction)
+		{
+			(float Left, float Right, float Top, float Bottom) position = _drawningObject.GetCurrentPosition();
+			if (direction == Direction.Left)
+			{
+				position.Left -= _drawningObject.Step;
+			}
+			else if (direction == Direction.Right)
+			{
+				position.Right += _drawningObject.Step;
+			}
+			else if (direction == Direction.Up)
+			{
+				position.Top -= _drawningObject.Step;
+			}
+			else if (direction == Direction.Down)
+			{
+				position.Bottom += _drawningObject.Step;
+			}
+
+			if (CanMove(direction, position))
+			{
+				_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);
+			for (int i = (int)(_drawningObject.GetCurrentPosition().Top / _size_y); i <= (int)(_drawningObject.GetCurrentPosition().Bottom / _size_y); ++i)
+			{
+				for (int j = (int)(_drawningObject.GetCurrentPosition().Left / _size_x); j <= (int)(_drawningObject.GetCurrentPosition().Right / _size_x); ++j)
+				{
+					if (_map[i, j] == _barrier) _map[i, j] = _freeRoad;
+				}
+			}
+			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);
+	}
+}

WarmlyShip/WarmlyShip/Direction.cs

@@ -6,8 +6,9 @@ using System.Threading.Tasks;
 
 namespace WarmlyShip
 {
-	internal enum Direction //Направление при перемещении
+	public enum Direction //Направление при перемещении
 	{
+		None = 0,
 		Left = 1, //Влево
 		Up = 2, //Вверх
 		Right = 3, //Вправо

WarmlyShip/WarmlyShip/DrawingWarmlyShip.cs

@@ -6,21 +6,26 @@ using System.Threading.Tasks;
 
 namespace WarmlyShip
 {
-	internal class DrawingWarmlyShip
+	public class DrawingWarmlyShip
 	{
-		public EntityWarmlyShip warmlyShip { private set; get; } //Класс-сущность
-		public float _startPosX; //Координаты отрисовки по оси x
-		public float _startPosY; //Координаты отрисовки по оси y
+		public EntityWarmlyShip warmlyShip { protected set; get; } //Класс-сущность
+		protected float _startPosX; //Координаты отрисовки по оси x
+		protected float _startPosY; //Координаты отрисовки по оси y
 		private int? _pictureWidth = null; //Ширина окна
 		private int? _pictureHeight = null; //Высота окна
-		private readonly int _warmlyShipWidth = 125; //Ширина отрисовки корабля 
-		private readonly int _warmlyShipHeight = 50; //Высота отрисовки корабля
+		protected readonly int _warmlyShipWidth = 125; //Ширина отрисовки корабля 
+		protected readonly int _warmlyShipHeight = 50; //Высота отрисовки корабля
 
 		//Инициализация
-		public void Init(int speed, float weight, Color bodyColor)
+		public DrawingWarmlyShip(int speed, float weight, Color bodyColor)
 		{
-			warmlyShip = new EntityWarmlyShip();
-			warmlyShip.Init(speed, weight, bodyColor);
+			warmlyShip = new EntityWarmlyShip(speed, weight, bodyColor);
+		}
+
+		protected DrawingWarmlyShip(int speed, float weight, Color bodyColor, int warmlyWidth, int warmlyHeight) : this(speed, weight, bodyColor)
+		{
+			_warmlyShipWidth = warmlyWidth;
+			_warmlyShipHeight = warmlyHeight;
 		}
 
 		//Начальные коордитанты 
@@ -56,7 +61,7 @@ namespace WarmlyShip
 		}
 
 		//Отрисовка транспорта
-		public void DrawTransport(Graphics g)
+		public virtual void DrawTransport(Graphics g)
 		{
 			if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
 			{
@@ -109,5 +114,10 @@ namespace WarmlyShip
 			}
 
 		}
+
+		public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+		{
+			return (_startPosX, _startPosX + _warmlyShipWidth, _startPosY, _startPosY + _warmlyShipHeight);
+		}
 	}
 }

WarmlyShip/WarmlyShip/DrawningMotorShip.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal class DrawningMotorShip : DrawingWarmlyShip
+	{
+		public DrawningMotorShip(int speed, float weight, Color bodyColor, Color dopColor, bool tubes, bool cistern) : base(speed, weight, bodyColor, 150, 75)
+		{
+			warmlyShip = new EntityMotorShip(speed, weight, bodyColor, dopColor, tubes , cistern);
+		}
+
+		public override void DrawTransport(Graphics g)
+		{
+			if (warmlyShip is not EntityMotorShip motorShip)
+			{
+				return;
+			}
+
+			Pen pen = new(Color.Black, 2);
+			Brush dopBrush = new SolidBrush(motorShip.DopColor);
+			if (motorShip.Tubes)
+			{
+				g.FillRectangle(dopBrush, _startPosX + _warmlyShipWidth / 5, _startPosY, _warmlyShipWidth / 5, _warmlyShipHeight / 2);
+				g.DrawRectangle(pen, _startPosX + _warmlyShipWidth / 5, _startPosY, _warmlyShipWidth / 5, _warmlyShipHeight / 2);
+				g.FillRectangle(dopBrush, _startPosX + _warmlyShipWidth * 3 / 5, _startPosY, _warmlyShipWidth / 5, _warmlyShipHeight / 2);
+				g.DrawRectangle(pen, _startPosX + _warmlyShipWidth * 3 / 5, _startPosY, _warmlyShipWidth / 5, _warmlyShipHeight / 2);
+			}
+
+			_startPosY += 25;
+			base.DrawTransport(g);
+			_startPosY -= 25;
+
+			if (motorShip.Cistern)
+			{
+				g.FillEllipse(dopBrush, _startPosX, _startPosY + 25, 25, 20);
+				g.DrawEllipse(pen, _startPosX, _startPosY + 25, 25, 20);
+			}
+		}
+	}
+}

WarmlyShip/WarmlyShip/DrawningObjectShip.cs

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

WarmlyShip/WarmlyShip/EntityMotorShip.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal class EntityMotorShip : EntityWarmlyShip
+	{
+		public Color DopColor { get; private set; }
+		public bool Tubes { get; private set; }
+		public bool Cistern { get; private set; }
+
+		public EntityMotorShip(int speed, float weight, Color bodyColor, Color dopColor, bool tubes, bool cistern) : base(speed, weight, bodyColor)
+		{
+			DopColor = dopColor;
+			Tubes = tubes;
+			Cistern = cistern;
+		}
+
+	}
+}
+ 

WarmlyShip/WarmlyShip/EntityWarmlyShip.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace WarmlyShip
 {
-	internal class EntityWarmlyShip
+	public class EntityWarmlyShip
 	{
 		public int Speed { get; private set; } //Скорость
 		public float Weight { get; private set; } //Вес
@@ -14,7 +14,7 @@ namespace WarmlyShip
 		public float Step => Speed * 100 / Weight; //Шаг при перемещении
 
 		//Инициализация
-		public void Init(int speed, float weight, Color bodyColor)
+		public EntityWarmlyShip(int speed, float weight, Color bodyColor)
 		{
 			Random random = new Random();
 			Speed = speed <= 0 ? random.Next(50, 150) : speed;

WarmlyShip/WarmlyShip/FormClass.Designer.cs

@@ -38,6 +38,8 @@
 			this.buttonLeft = new System.Windows.Forms.Button();
 			this.buttonDown = new System.Windows.Forms.Button();
 			this.ButtonCreate = new System.Windows.Forms.Button();
+			this.buttonCreateModif = new System.Windows.Forms.Button();
+			this.buttonSelectShip = new System.Windows.Forms.Button();
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
 			this.statusStrip.SuspendLayout();
 			this.SuspendLayout();
@@ -142,11 +144,34 @@
 			this.ButtonCreate.UseVisualStyleBackColor = true;
 			this.ButtonCreate.Click += new System.EventHandler(this.ButtonCreate_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(93, 402);
+			this.buttonCreateModif.Name = "buttonCreateModif";
+			this.buttonCreateModif.Size = new System.Drawing.Size(101, 23);
+			this.buttonCreateModif.TabIndex = 8;
+			this.buttonCreateModif.Text = "Модификация";
+			this.buttonCreateModif.UseVisualStyleBackColor = true;
+			this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
+			// 
+			// buttonSelectShip
+			// 
+			this.buttonSelectShip.Location = new System.Drawing.Point(522, 402);
+			this.buttonSelectShip.Name = "buttonSelectShip";
+			this.buttonSelectShip.Size = new System.Drawing.Size(75, 23);
+			this.buttonSelectShip.TabIndex = 9;
+			this.buttonSelectShip.Text = "Выбрать";
+			this.buttonSelectShip.UseVisualStyleBackColor = true;
+			this.buttonSelectShip.Click += new System.EventHandler(this.ButtonSelectShip_Click);
+			// 
 			// FormClass
 			// 
 			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.buttonSelectShip);
+			this.Controls.Add(this.buttonCreateModif);
 			this.Controls.Add(this.ButtonCreate);
 			this.Controls.Add(this.buttonDown);
 			this.Controls.Add(this.buttonLeft);
@@ -176,5 +201,7 @@
 		private Button buttonLeft;
 		private Button buttonDown;
 		private Button ButtonCreate;
+		private Button buttonCreateModif;
+		private Button buttonSelectShip;
 	}
 }

WarmlyShip/WarmlyShip/FormClass.cs

@@ -4,6 +4,8 @@ namespace WarmlyShip
     {
         private DrawingWarmlyShip _warmlyShip;
 
+        public DrawingWarmlyShip SelectedShip { get; private set; }
+
         public FormClass()
         {
             InitializeComponent();
@@ -17,19 +19,31 @@ namespace WarmlyShip
             pictureBox.Image = bmp;
         }
 
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
+		private void SetData()
+		{
 			Random random = new Random();
-			_warmlyShip = new DrawingWarmlyShip();
-			_warmlyShip.Init(random.Next(100, 300), random.Next(1000, 3000), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)));
-			_warmlyShip.SetPosition(random.Next(10, 100), random.Next(10, 100), pictureBox.Width, pictureBox.Height);
-			toolStripStatusSpeed.Text = $"Ñêîðîñòü: {_warmlyShip.warmlyShip?.Speed}";
+			_warmlyShip.SetPosition(random.Next(0, 100), random.Next(0, 100), pictureBox.Width, pictureBox.Height);
+			toolStripStatusSpeed.Text = $"Ńęîđîńňü: { _warmlyShip.warmlyShip?.Speed}";
 			toolStripStatusWeight.Text = $"Âåñ: {_warmlyShip.warmlyShip?.Weight}";
 			toolStripStatusLabelBodyColor.Text = $"Öâåò: {_warmlyShip.warmlyShip?.BodyColor}";
-			Draw();
 		}
 
-        private void ButtonMove_Click(object sender, EventArgs e)
+		private void ButtonCreate_Click(object sender, EventArgs e)
+        {
+			Random rnd = new();
+			Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+			ColorDialog dialog = new();
+			if (dialog.ShowDialog() == DialogResult.OK)
+			{
+				color = dialog.Color;
+			}
+			_warmlyShip = new DrawingWarmlyShip(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
+			SetData();
+			Draw();
+
+		}
+
+		private void ButtonMove_Click(object sender, EventArgs e)
         {
             string name = ((Button)sender)?.Name ?? string.Empty;
             switch (name)
@@ -55,5 +69,31 @@ namespace WarmlyShip
 			_warmlyShip?.ChangeBorders(pictureBox.Width, pictureBox.Height);
 			Draw();
 		}
+
+        private void ButtonCreateModif_Click(object sender, EventArgs e)
+        {
+			Random rnd = new();
+			Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+			ColorDialog dialog = new();
+			if (dialog.ShowDialog() == DialogResult.OK)
+			{
+				color = dialog.Color;
+			}
+			Color dopColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+			ColorDialog dialogDop = new();
+			if (dialogDop.ShowDialog() == DialogResult.OK)
+			{
+				dopColor = dialogDop.Color;
+			}
+			_warmlyShip = new DrawningMotorShip(rnd.Next(100, 300), rnd.Next(1000, 2000), color, dopColor, Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
+			SetData();
+			Draw();
+		}
+
+        private void ButtonSelectShip_Click(object sender, EventArgs e)
+        {
+			SelectedShip = _warmlyShip;
+			DialogResult = DialogResult.OK;
+		}
     }
 }

WarmlyShip/WarmlyShip/FormMapWithSetShip.Designer.cs

@@ -0,0 +1,216 @@
+namespace WarmlyShip
+{
+	partial class FormMapWithSetShip
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
+			this.buttonDown = new System.Windows.Forms.Button();
+			this.buttonLeft = new System.Windows.Forms.Button();
+			this.buttonUp = new System.Windows.Forms.Button();
+			this.buttonRight = new System.Windows.Forms.Button();
+			this.buttonShowOnMap = new System.Windows.Forms.Button();
+			this.buttonShowStorage = new System.Windows.Forms.Button();
+			this.buttonRemoveShip = new System.Windows.Forms.Button();
+			this.buttonAddShip = new System.Windows.Forms.Button();
+			this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+			this.pictureBox = new System.Windows.Forms.PictureBox();
+			this.groupBox1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Controls.Add(this.maskedTextBoxPosition);
+			this.groupBox1.Controls.Add(this.buttonDown);
+			this.groupBox1.Controls.Add(this.buttonLeft);
+			this.groupBox1.Controls.Add(this.buttonUp);
+			this.groupBox1.Controls.Add(this.buttonRight);
+			this.groupBox1.Controls.Add(this.buttonShowOnMap);
+			this.groupBox1.Controls.Add(this.buttonShowStorage);
+			this.groupBox1.Controls.Add(this.buttonRemoveShip);
+			this.groupBox1.Controls.Add(this.buttonAddShip);
+			this.groupBox1.Controls.Add(this.comboBoxSelectorMap);
+			this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
+			this.groupBox1.Location = new System.Drawing.Point(600, 0);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(200, 450);
+			this.groupBox1.TabIndex = 0;
+			this.groupBox1.TabStop = false;
+			this.groupBox1.Text = "Инструменты";
+			// 
+			// maskedTextBoxPosition
+			// 
+			this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 116);
+			this.maskedTextBoxPosition.Mask = "00";
+			this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+			this.maskedTextBoxPosition.Size = new System.Drawing.Size(188, 23);
+			this.maskedTextBoxPosition.TabIndex = 11;
+			// 
+			// buttonDown
+			// 
+			this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.buttonDown.BackgroundImage = global::WarmlyShip.Properties.Resources.todown;
+			this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+			this.buttonDown.Location = new System.Drawing.Point(75, 391);
+			this.buttonDown.Name = "buttonDown";
+			this.buttonDown.Size = new System.Drawing.Size(50, 50);
+			this.buttonDown.TabIndex = 10;
+			this.buttonDown.UseVisualStyleBackColor = true;
+			this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
+			// 
+			// buttonLeft
+			// 
+			this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.buttonLeft.BackgroundImage = global::WarmlyShip.Properties.Resources.toleft;
+			this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+			this.buttonLeft.Location = new System.Drawing.Point(19, 391);
+			this.buttonLeft.Name = "buttonLeft";
+			this.buttonLeft.Size = new System.Drawing.Size(50, 50);
+			this.buttonLeft.TabIndex = 9;
+			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::WarmlyShip.Properties.Resources.totop;
+			this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+			this.buttonUp.Location = new System.Drawing.Point(75, 335);
+			this.buttonUp.Name = "buttonUp";
+			this.buttonUp.Size = new System.Drawing.Size(50, 50);
+			this.buttonUp.TabIndex = 8;
+			this.buttonUp.UseVisualStyleBackColor = true;
+			this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+			// 
+			// buttonRight
+			// 
+			this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.buttonRight.BackgroundImage = global::WarmlyShip.Properties.Resources.toright;
+			this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+			this.buttonRight.Location = new System.Drawing.Point(131, 391);
+			this.buttonRight.Name = "buttonRight";
+			this.buttonRight.Size = new System.Drawing.Size(50, 50);
+			this.buttonRight.TabIndex = 7;
+			this.buttonRight.UseVisualStyleBackColor = true;
+			this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+			// 
+			// buttonShowOnMap
+			// 
+			this.buttonShowOnMap.Location = new System.Drawing.Point(6, 281);
+			this.buttonShowOnMap.Name = "buttonShowOnMap";
+			this.buttonShowOnMap.Size = new System.Drawing.Size(188, 23);
+			this.buttonShowOnMap.TabIndex = 5;
+			this.buttonShowOnMap.Text = "Посмотреть карту";
+			this.buttonShowOnMap.UseVisualStyleBackColor = true;
+			this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
+			// 
+			// buttonShowStorage
+			// 
+			this.buttonShowStorage.Location = new System.Drawing.Point(6, 226);
+			this.buttonShowStorage.Name = "buttonShowStorage";
+			this.buttonShowStorage.Size = new System.Drawing.Size(188, 23);
+			this.buttonShowStorage.TabIndex = 4;
+			this.buttonShowStorage.Text = "Посмотреть хранилище";
+			this.buttonShowStorage.UseVisualStyleBackColor = true;
+			this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
+			// 
+			// buttonRemoveShip
+			// 
+			this.buttonRemoveShip.Location = new System.Drawing.Point(6, 170);
+			this.buttonRemoveShip.Name = "buttonRemoveShip";
+			this.buttonRemoveShip.Size = new System.Drawing.Size(188, 23);
+			this.buttonRemoveShip.TabIndex = 3;
+			this.buttonRemoveShip.Text = "Удалить корабль";
+			this.buttonRemoveShip.UseVisualStyleBackColor = true;
+			this.buttonRemoveShip.Click += new System.EventHandler(this.ButtonRemoveShip_Click);
+			// 
+			// buttonAddShip
+			// 
+			this.buttonAddShip.Location = new System.Drawing.Point(6, 65);
+			this.buttonAddShip.Name = "buttonAddShip";
+			this.buttonAddShip.Size = new System.Drawing.Size(188, 23);
+			this.buttonAddShip.TabIndex = 1;
+			this.buttonAddShip.Text = "Добавить корабль";
+			this.buttonAddShip.UseVisualStyleBackColor = true;
+			this.buttonAddShip.Click += new System.EventHandler(this.ButtonAddShip_Click);
+			// 
+			// comboBoxSelectorMap
+			// 
+			this.comboBoxSelectorMap.FormattingEnabled = true;
+			this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Вторая карта",
+            "Последняя карта"});
+			this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 22);
+			this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+			this.comboBoxSelectorMap.Size = new System.Drawing.Size(188, 23);
+			this.comboBoxSelectorMap.TabIndex = 0;
+			this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
+			// 
+			// pictureBox
+			// 
+			this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.pictureBox.Location = new System.Drawing.Point(0, 0);
+			this.pictureBox.Name = "pictureBox";
+			this.pictureBox.Size = new System.Drawing.Size(600, 450);
+			this.pictureBox.TabIndex = 1;
+			this.pictureBox.TabStop = false;
+			// 
+			// FormMapWithSetShip
+			// 
+			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.pictureBox);
+			this.Controls.Add(this.groupBox1);
+			this.Name = "FormMapWithSetShip";
+			this.Text = "FormMapWithSetShip";
+			this.groupBox1.ResumeLayout(false);
+			this.groupBox1.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private GroupBox groupBox1;
+		private PictureBox pictureBox;
+		private Button buttonAddShip;
+		private ComboBox comboBoxSelectorMap;
+		private Button buttonShowOnMap;
+		private Button buttonShowStorage;
+		private Button buttonRemoveShip;
+		private Button buttonDown;
+		private Button buttonLeft;
+		private Button buttonUp;
+		private Button buttonRight;
+		private MaskedTextBox maskedTextBoxPosition;
+	}
+}

WarmlyShip/WarmlyShip/FormMapWithSetShip.cs

@@ -0,0 +1,139 @@
+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;
+using WarmlyShip;
+
+namespace WarmlyShip
+{
+	public partial class FormMapWithSetShip : Form
+	{
+		private MapWithSetShipGeneric<DrawningObjectShip, AbstractMap> _mapShipCollectionGeneric;
+		public bool ShipOnMap = false;
+
+		public FormMapWithSetShip()
+		{
+			InitializeComponent();
+		}
+
+		private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			AbstractMap map = null;
+			switch (comboBoxSelectorMap.Text)
+			{
+				case "Простая карта":
+					map = new SimpleMap();
+					break;
+				case "Вторая карта":
+					map = new SecondMap();
+					break;
+				case "Последняя карта":
+					map = new LastMap();
+					break;
+			}
+			if (map != null)
+			{
+				_mapShipCollectionGeneric = new MapWithSetShipGeneric<DrawningObjectShip, AbstractMap>(pictureBox.Width, pictureBox.Height, map);
+			}
+			else
+			{
+				_mapShipCollectionGeneric = null;
+			}
+		}
+		private void ButtonAddShip_Click(object sender, EventArgs e)
+		{
+			if (_mapShipCollectionGeneric == null)
+			{
+				return;
+			}
+			FormClass form = new();
+			if (form.ShowDialog() == DialogResult.OK)
+			{
+				DrawningObjectShip ship = new(form.SelectedShip);
+				if (_mapShipCollectionGeneric + ship > -1)
+				{
+					MessageBox.Show("Объект добавлен");
+					pictureBox.Image = _mapShipCollectionGeneric.ShowSet();
+				}
+				else
+				{
+					MessageBox.Show("Не удалось добавить объект");
+				}
+			}
+		}
+
+		private void ButtonRemoveShip_Click(object sender, EventArgs e)
+		{
+			if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
+			{
+				return;
+			}
+			if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+			{
+				return;
+			}
+			int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+			if (_mapShipCollectionGeneric - pos != null)
+			{
+				MessageBox.Show("Объект удален");
+				pictureBox.Image = _mapShipCollectionGeneric.ShowSet();
+			}
+			else
+			{
+				MessageBox.Show("Не удалось удалить объект");
+			}
+		}
+
+		private void ButtonShowStorage_Click(object sender, EventArgs e)
+		{
+			if (_mapShipCollectionGeneric == null)
+			{
+				return;
+			}
+			pictureBox.Image = _mapShipCollectionGeneric.ShowSet();
+			ShipOnMap = false;
+		}
+
+		private void ButtonShowOnMap_Click(object sender, EventArgs e)
+		{
+			if (_mapShipCollectionGeneric == null)
+			{
+				return;
+			}
+			pictureBox.Image = _mapShipCollectionGeneric.ShowOnMap();
+			ShipOnMap = true;
+		}
+
+		private void ButtonMove_Click(object sender, EventArgs e)
+		{
+			if (_mapShipCollectionGeneric == null || !ShipOnMap)
+			{
+				return;
+			}
+			//получаем имя кнопки
+			string name = ((Button)sender)?.Name ?? string.Empty;
+			Direction dir = Direction.None;
+			switch (name)
+			{
+				case "buttonUp":
+					dir = Direction.Up;
+					break;
+				case "buttonDown":
+					dir = Direction.Down;
+					break;
+				case "buttonLeft":
+					dir = Direction.Left;
+					break;
+				case "buttonRight":
+					dir = Direction.Right;
+					break;
+			}
+			pictureBox.Image = _mapShipCollectionGeneric.MoveObject(dir);
+		}
+	}
+}

WarmlyShip/WarmlyShip/FormMapWithSetShip.resx

@@ -0,0 +1,60 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

WarmlyShip/WarmlyShip/IDrawningObject.cs

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

WarmlyShip/WarmlyShip/LastMap.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal class LastMap : AbstractMap
+	{
+		private readonly Brush barrierColor = new SolidBrush(Color.Red);
+
+		private readonly Brush roadColor = new SolidBrush(Color.Green);
+
+		protected override void DrawBarrierPart(Graphics g, int i, int j)
+		{
+			g.FillRectangle(barrierColor, j * _size_x, i * _size_y, _size_x, _size_y);
+		}
+		protected override void DrawRoadPart(Graphics g, int i, int j)
+		{
+			g.FillRectangle(roadColor, j * _size_x, i * _size_y, _size_x, _size_y);
+		}
+		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 < 45)
+			{
+				int x = _random.Next(0, 100);
+				int y = _random.Next(0, 100);
+				if (_map[x, y] == _freeRoad)
+				{
+					_map[x, y] = _barrier;
+					if (x > 0 && y > 0 && x < _map.GetLength(0) - 1 && y < _map.GetLength(1) - 1)
+					{
+						_map[x - 1, y] = _barrier;
+						_map[x + 1, y] = _barrier;
+						_map[x, y - 1] = _barrier;
+						_map[x, y + 1] = _barrier;
+					}
+					counter++;
+				}
+			}
+		}
+	}
+}

WarmlyShip/WarmlyShip/MapWithSetShipGeneric.cs

@@ -0,0 +1,127 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal class MapWithSetShipGeneric<T, U>
+		where T : class, IDrawningObject
+		where U : AbstractMap
+	{
+		private readonly int _pictureWidth;
+		private readonly int _pictureHeight;
+		private readonly int _placeSizeWidth = 210;
+		private readonly int _placeSizeHeight = 100;
+		private readonly SetShipGeneric<T> _setShips;
+		private readonly U _map;
+
+		public MapWithSetShipGeneric(int picWidth, int picHeight, U map)
+		{
+			int width = picWidth / _placeSizeWidth;
+			int height = picHeight / _placeSizeHeight;
+			_setShips = new SetShipGeneric<T>(width * height);
+			_pictureWidth = picWidth;
+			_pictureHeight = picHeight;
+			_map = map;
+		}
+
+		public static int operator +(MapWithSetShipGeneric<T, U> map, T ship)
+		{
+			return map._setShips.Insert(ship);
+		}
+
+		public static T operator -(MapWithSetShipGeneric<T, U> map, int position)
+		{
+			return map._setShips.Remove(position);
+		}
+
+		public Bitmap ShowSet()
+		{
+			Bitmap bmp = new(_pictureWidth, _pictureHeight);
+			Graphics gr = Graphics.FromImage(bmp);
+			DrawShips(gr);
+			DrawBackground(gr);
+			return bmp;
+		}
+
+		public Bitmap ShowOnMap()
+		{
+			Shaking();
+			for (int i = 0; i < _setShips.Count; i++)
+			{
+				var ship = _setShips.Get(i);
+				if (ship != null)
+				{
+					return _map.CreateMap(_pictureWidth, _pictureHeight, ship);
+				}
+			}
+			return new(_pictureWidth, _pictureHeight);
+		}
+
+		public Bitmap MoveObject(Direction direction)
+		{
+			if (_map != null)
+			{
+				return _map.MoveObject(direction);
+			}
+			return new(_pictureWidth, _pictureHeight);
+		}
+
+		private void Shaking()
+		{
+			int j = _setShips.Count - 1;
+			for (int i = 0; i < _setShips.Count; ++i)
+			{
+				if (_setShips.Get(i) == null)
+				{
+					for (; j > i; --j)
+					{
+						var car = _setShips.Get(j);
+						if (car != null)
+						{
+							_setShips.Insert(car, i);
+							_setShips.Remove(j);
+							break;
+						}
+					}
+					if (j <= i)
+					{
+						return;
+					}
+				}
+			}
+		}
+
+		private void DrawBackground(Graphics g)
+		{
+			Pen pen = new(Color.Brown, 8);
+			for (int i = 0; i < _pictureWidth / _placeSizeWidth; ++i)
+			{
+				for (int j = 1; j < _pictureHeight / _placeSizeHeight + 1; ++j) //линия рамзетки места
+				{
+					g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
+					for (int k = 0; k < _placeSizeWidth / (30 * 2); ++k) 
+						g.DrawLine(pen, i * _placeSizeWidth + (k + 1) * 30, j * _placeSizeHeight, i * _placeSizeWidth + (k + 1) * 30, j * _placeSizeHeight + 30);
+				}
+				g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
+			}
+		}
+
+		private void DrawShips(Graphics g)
+		{
+			for (int i = 0; i < _setShips.Count; ++i)
+			{
+				if (_setShips.Get(i) != null )
+				{
+					int temp = 0;
+					if (_setShips.Get(i).GetCurrentPosition().Bottom - _setShips.Get(i).GetCurrentPosition().Top < 75) temp = (int)(_setShips.Get(i).GetCurrentPosition().Bottom - _setShips.Get(i).GetCurrentPosition().Top);
+					_setShips.Get(i).SetObject((_pictureWidth / _placeSizeWidth - (i % (_pictureWidth / _placeSizeWidth)) - 1) * _placeSizeWidth, (i / (_pictureWidth / _placeSizeWidth)) * _placeSizeHeight + temp, _pictureWidth, _pictureHeight);
+					_setShips.Get(i).DrawningObject(g);
+				}
+			}
+		}
+
+	}
+}

WarmlyShip/WarmlyShip/Program.cs

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

WarmlyShip/WarmlyShip/SecondMap.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal class SecondMap : AbstractMap
+	{
+		private readonly Brush barrierColor = new SolidBrush(Color.Gold);
+
+		private readonly Brush roadColor = new SolidBrush(Color.Black);
+
+		protected override void DrawBarrierPart(Graphics g, int i, int j)
+		{
+			g.FillRectangle(barrierColor, j * _size_x, i * _size_y, _size_x, _size_y);
+		}
+		protected override void DrawRoadPart(Graphics g, int i, int j)
+		{
+			g.FillRectangle(roadColor, j * _size_x, i * _size_y, _size_x, _size_y);
+		}
+		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;
+				}
+			}
+			for (int i = 0; i < _map.GetLength(0); ++i) 
+			{
+				_map[i, _map.GetLength(1) / 2] = _barrier;
+				_map[i, _map.GetLength(1) - 1] = _barrier;
+			}
+			for (int j = 0; j < _map.GetLength(1); ++j)
+			{
+				_map[_map.GetLength(0) - 1, j] = _barrier;
+			}
+			while (counter < 45)
+			{
+				int x = _random.Next(0, 100);
+				int y = _random.Next(0, 100);
+				if (_map[x, y] == _freeRoad)
+				{
+					_map[x, y] = _barrier;
+					counter++;
+				}
+			}
+		}
+	}
+}

WarmlyShip/WarmlyShip/SetShipGeneric.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal class SetShipGeneric<T>
+		where T : class
+	{
+		private readonly T[] _places;
+		public int Count => _places.Length;
+
+		public SetShipGeneric(int count)
+		{
+			_places = new T[count];
+		}
+
+		private bool CanInsert(int position)
+		{
+			for (int i = position; i < _places.Length; ++i)
+				if (_places[i] == null) return true;
+			return false;
+		}
+
+		public int Insert(T ship)
+		{
+			return Insert(ship, 0);
+		}
+
+		public int Insert(T ship, int position)
+		{
+			if (position < 0 || position > _places.Length) return -1;
+			if (_places[position] != null && CanInsert(position))
+			{
+				for (int i = _places.Length - 1; i > position; --i)
+				{
+					if (_places[i] == null)
+					{
+						_places[i] = _places[i - 1];
+						_places[i - 1] = null;
+					}
+				}
+			}
+			_places[position] = ship;
+			return position;
+		}
+
+		public T Remove(int position)
+		{
+			T DelElement = _places[position];
+			_places[position] = null;
+			return DelElement;
+		}
+
+		public T Get(int position)
+		{
+			if (position < 0 || position > _places.Length) return null;
+			return _places[position];
+		}
+
+	}
+}

WarmlyShip/WarmlyShip/SimpleMap.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal class SimpleMap : AbstractMap
+	{
+		private readonly Brush barrierColor = new SolidBrush(Color.Black);
+
+		private readonly Brush roadColor = new SolidBrush(Color.Gray);
+
+		protected override void DrawBarrierPart(Graphics g, int i, int j)
+		{
+			g.FillRectangle(barrierColor, j * _size_x, i * _size_y, _size_x, _size_y);
+		}
+		protected override void DrawRoadPart(Graphics g, int i, int j)
+		{
+			g.FillRectangle(roadColor, j * _size_x, i * _size_y, _size_x, _size_y);
+		}
+		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++;
+				}
+			}
+		}
+	}
+}