diff --git a/Warship/Warship/AbstractMap.cs b/Warship/Warship/AbstractMap.cs
new file mode 100644
index 0000000..b55f448
--- /dev/null
+++ b/Warship/Warship/AbstractMap.cs
@@ -0,0 +1,157 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Warship
+{
+ internal abstract class AbstractMap
+ {
+ private IDrawningObject _drawningObject = null;
+ protected int[,] _map = null;
+ protected int _width;
+ protected int _height;
+ protected float _size_x;
+ protected float _size_y;
+ protected readonly Random _random = new();
+ protected readonly int _freeRoad = 0;
+ protected readonly int _barrier = 1;
+
+ public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject)
+ {
+ _width = width;
+ _height = height;
+ _drawningObject = drawningObject;
+ GenerateMap();
+ while (!SetObjectOnMap())
+ {
+ GenerateMap();
+ }
+ return DrawMapWithObject();
+ }
+
+ public bool CheckAround(float Left, float Right, float Top, float Bottom)
+ {
+ int startX = (int)(Left / _size_x);
+ int startY = (int)(Right / _size_y);
+ int endX = (int)(Top / _size_x);
+ if (endX > 100)
+ {
+ endX = 100;
+ }
+ int endY = (int)(Bottom / _size_y);
+ if (endY > 100)
+ {
+ endY = 100;
+ }
+
+ for (int i = startX; i < endX; i++)
+ {
+ for (int j = startY; j < endY; j++)
+ {
+ if (_map[i, j] == _barrier)
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ public Bitmap MoveObject(Direction direction)
+ {
+ _drawningObject.MoveObject(direction);
+ (float Left, float Right, float Top, float Bottom) = _drawningObject.GetCurrentPosition();
+
+ if (CheckAround(Left, Right, Top, Bottom))
+ {
+ _drawningObject.MoveObject(MoveObjectBack(direction));
+ }
+ return DrawMapWithObject();
+ }
+
+ private Direction MoveObjectBack(Direction direction)
+ {
+ switch (direction)
+ {
+ case Direction.Up:
+ return Direction.Down;
+ case Direction.Down:
+ return Direction.Up;
+ case Direction.Left:
+ return Direction.Right;
+ case Direction.Right:
+ return Direction.Left;
+ }
+ return Direction.None;
+ }
+
+ private bool SetObjectOnMap()
+ {
+ if (_drawningObject == null || _map == null)
+ {
+ return false;
+ }
+ int x = _random.Next(0, 10);
+ int y = _random.Next(0, 10);
+ _drawningObject.SetObject(x, y, _width, _height);
+ (float Left, float Right, float Top, float Bottom) = _drawningObject.GetCurrentPosition();
+ if (!CheckAround(Left, Right, Top, Bottom)) return true;
+ float startX = Left;
+ float startY = Right;
+ float lengthX = Top - Left;
+ float lengthY = Bottom - Right;
+ while (CheckAround(startX, startY, startX + lengthX, startY + lengthY))
+ {
+ bool result;
+ do
+ {
+ result = CheckAround(startX, startY, startX + lengthX, startY + lengthY);
+ if (!result)
+ {
+ _drawningObject.SetObject((int)startX, (int)startY, _width, _height);
+ return true;
+ }
+ else
+ {
+ startX += _size_x;
+ }
+ } while (result);
+ startX = x;
+ startY += _size_y;
+ }
+ return false;
+ }
+
+ private Bitmap DrawMapWithObject()
+ {
+ Bitmap bmp = new(_width, _height);
+ if (_drawningObject == null || _map == null)
+ {
+ return bmp;
+ }
+ Graphics gr = Graphics.FromImage(bmp);
+ for (int i = 0; i < _map.GetLength(0); ++i)
+ {
+ for (int j = 0; j < _map.GetLength(1); ++j)
+ {
+ if (_map[i, j] == _freeRoad)
+ {
+ DrawRoadPart(gr, i, j);
+ }
+ else if (_map[i, j] == _barrier)
+ {
+ DrawBarrierPart(gr, i, j);
+ }
+ }
+ }
+ _drawningObject.DrawningObject(gr);
+ return bmp;
+ }
+
+ protected abstract void GenerateMap();
+ protected abstract void DrawRoadPart(Graphics g, int i, int j);
+ protected abstract void DrawBarrierPart(Graphics g, int i, int j);
+ }
+}
diff --git a/Warship/Warship/Direction.cs b/Warship/Warship/Direction.cs
index caf3172..3f2646a 100644
--- a/Warship/Warship/Direction.cs
+++ b/Warship/Warship/Direction.cs
@@ -6,8 +6,9 @@ using System.Threading.Tasks;
namespace Warship
{
- internal enum Direction
+ public enum Direction
{
+ None = 0,
Up = 1,
Down = 2,
Left = 3,
diff --git a/Warship/Warship/Warship.resx b/Warship/Warship/FormMap.resx
similarity index 98%
rename from Warship/Warship/Warship.resx
rename to Warship/Warship/FormMap.resx
index e9e4f2e..5cb320f 100644
--- a/Warship/Warship/Warship.resx
+++ b/Warship/Warship/FormMap.resx
@@ -58,6 +58,6 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- 37, 11
+ 17, 17
\ No newline at end of file
diff --git a/Warship/Warship/FormMapWithSetWarships.Designer.cs b/Warship/Warship/FormMapWithSetWarships.Designer.cs
new file mode 100644
index 0000000..b2380c3
--- /dev/null
+++ b/Warship/Warship/FormMapWithSetWarships.Designer.cs
@@ -0,0 +1,222 @@
+namespace Warship
+{
+ partial class FormMapWithSetWarships
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.buttonDown = new System.Windows.Forms.Button();
+ this.buttonRight = new System.Windows.Forms.Button();
+ this.buttonLeft = new System.Windows.Forms.Button();
+ this.buttonUp = new System.Windows.Forms.Button();
+ this.ButtonShowOnMap = new System.Windows.Forms.Button();
+ this.ButtonShowStorage = new System.Windows.Forms.Button();
+ this.ButtonRemoveWarship = new System.Windows.Forms.Button();
+ this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
+ this.buttonAddWarship = new System.Windows.Forms.Button();
+ this.label1 = new System.Windows.Forms.Label();
+ this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ this.groupBox1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.buttonDown);
+ this.groupBox1.Controls.Add(this.buttonRight);
+ this.groupBox1.Controls.Add(this.buttonLeft);
+ this.groupBox1.Controls.Add(this.buttonUp);
+ this.groupBox1.Controls.Add(this.ButtonShowOnMap);
+ this.groupBox1.Controls.Add(this.ButtonShowStorage);
+ this.groupBox1.Controls.Add(this.ButtonRemoveWarship);
+ this.groupBox1.Controls.Add(this.maskedTextBoxPosition);
+ this.groupBox1.Controls.Add(this.buttonAddWarship);
+ this.groupBox1.Controls.Add(this.label1);
+ this.groupBox1.Controls.Add(this.comboBoxSelectorMap);
+ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
+ this.groupBox1.Location = new System.Drawing.Point(617, 0);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(183, 450);
+ this.groupBox1.TabIndex = 0;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "groupBox1";
+ //
+ // buttonDown
+ //
+ this.buttonDown.BackgroundImage = global::Warship.Properties.Resources.arrowDown;
+ this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+ this.buttonDown.Location = new System.Drawing.Point(78, 407);
+ this.buttonDown.Name = "buttonDown";
+ this.buttonDown.Size = new System.Drawing.Size(30, 30);
+ this.buttonDown.TabIndex = 10;
+ this.buttonDown.UseVisualStyleBackColor = true;
+ this.buttonDown.UseWaitCursor = true;
+ //
+ // buttonRight
+ //
+ this.buttonRight.BackgroundImage = global::Warship.Properties.Resources.arrowRight;
+ this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+ this.buttonRight.Location = new System.Drawing.Point(114, 407);
+ this.buttonRight.Name = "buttonRight";
+ this.buttonRight.Size = new System.Drawing.Size(30, 30);
+ this.buttonRight.TabIndex = 9;
+ this.buttonRight.UseVisualStyleBackColor = true;
+ this.buttonRight.UseWaitCursor = true;
+ //
+ // buttonLeft
+ //
+ this.buttonLeft.BackgroundImage = global::Warship.Properties.Resources.arrowLeft;
+ this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+ this.buttonLeft.Location = new System.Drawing.Point(42, 408);
+ this.buttonLeft.Name = "buttonLeft";
+ this.buttonLeft.Size = new System.Drawing.Size(30, 30);
+ this.buttonLeft.TabIndex = 8;
+ this.buttonLeft.UseVisualStyleBackColor = true;
+ this.buttonLeft.UseWaitCursor = true;
+ //
+ // buttonUp
+ //
+ this.buttonUp.BackColor = System.Drawing.SystemColors.Control;
+ this.buttonUp.BackgroundImage = global::Warship.Properties.Resources.arrowUp;
+ this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+ this.buttonUp.Location = new System.Drawing.Point(78, 371);
+ this.buttonUp.Name = "buttonUp";
+ this.buttonUp.Size = new System.Drawing.Size(30, 30);
+ this.buttonUp.TabIndex = 7;
+ this.buttonUp.UseVisualStyleBackColor = true;
+ this.buttonUp.UseWaitCursor = true;
+ //
+ // ButtonShowOnMap
+ //
+ this.ButtonShowOnMap.Location = new System.Drawing.Point(6, 319);
+ this.ButtonShowOnMap.Name = "ButtonShowOnMap";
+ this.ButtonShowOnMap.Size = new System.Drawing.Size(165, 23);
+ this.ButtonShowOnMap.TabIndex = 6;
+ 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, 259);
+ this.ButtonShowStorage.Name = "ButtonShowStorage";
+ this.ButtonShowStorage.Size = new System.Drawing.Size(165, 23);
+ this.ButtonShowStorage.TabIndex = 5;
+ this.ButtonShowStorage.Text = "Посмотреть хранилище";
+ this.ButtonShowStorage.UseVisualStyleBackColor = true;
+ this.ButtonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
+ //
+ // ButtonRemoveWarship
+ //
+ this.ButtonRemoveWarship.Location = new System.Drawing.Point(6, 191);
+ this.ButtonRemoveWarship.Name = "ButtonRemoveWarship";
+ this.ButtonRemoveWarship.Size = new System.Drawing.Size(165, 23);
+ this.ButtonRemoveWarship.TabIndex = 4;
+ this.ButtonRemoveWarship.Text = "Удалить корабль";
+ this.ButtonRemoveWarship.UseVisualStyleBackColor = true;
+ this.ButtonRemoveWarship.Click += new System.EventHandler(this.ButtonRemoveWarship_Click);
+ //
+ // maskedTextBoxPosition
+ //
+ this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 144);
+ this.maskedTextBoxPosition.Mask = "00";
+ this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+ this.maskedTextBoxPosition.Size = new System.Drawing.Size(165, 23);
+ this.maskedTextBoxPosition.TabIndex = 3;
+ //
+ // buttonAddWarship
+ //
+ this.buttonAddWarship.Location = new System.Drawing.Point(6, 101);
+ this.buttonAddWarship.Name = "buttonAddWarship";
+ this.buttonAddWarship.Size = new System.Drawing.Size(165, 23);
+ this.buttonAddWarship.TabIndex = 2;
+ this.buttonAddWarship.Text = "Добавить корабль";
+ this.buttonAddWarship.UseVisualStyleBackColor = true;
+ this.buttonAddWarship.Click += new System.EventHandler(this.ButtonAddWarship_Click);
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(6, 19);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(83, 15);
+ this.label1.TabIndex = 1;
+ this.label1.Text = "Инструменты";
+ //
+ // comboBoxSelectorMap
+ //
+ this.comboBoxSelectorMap.FormattingEnabled = true;
+ this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 51);
+ this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+ this.comboBoxSelectorMap.Size = new System.Drawing.Size(165, 23);
+ this.comboBoxSelectorMap.TabIndex = 0;
+ this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.СomboBoxSelectorMap_SelectedIndexChanged);
+ //
+ // pictureBox1
+ //
+ this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.pictureBox1.Location = new System.Drawing.Point(0, 0);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(617, 450);
+ this.pictureBox1.TabIndex = 1;
+ this.pictureBox1.TabStop = false;
+ this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click);
+ //
+ // ForMapWithSetWarships
+ //
+ 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.pictureBox1);
+ this.Controls.Add(this.groupBox1);
+ this.Name = "ForMapWithSetWarships";
+ this.Text = "ForMapWithSetWarships";
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private GroupBox groupBox1;
+ private Button ButtonShowOnMap;
+ private Button ButtonShowStorage;
+ private Button ButtonRemoveWarship;
+ private MaskedTextBox maskedTextBoxPosition;
+ private Button buttonAddWarship;
+ private Label label1;
+ private ComboBox comboBoxSelectorMap;
+ private PictureBox pictureBox1;
+ private Button buttonUp;
+ private Button buttonDown;
+ private Button buttonRight;
+ private Button buttonLeft;
+ }
+}
\ No newline at end of file
diff --git a/Warship/Warship/FormMapWithSetWarships.cs b/Warship/Warship/FormMapWithSetWarships.cs
new file mode 100644
index 0000000..9352178
--- /dev/null
+++ b/Warship/Warship/FormMapWithSetWarships.cs
@@ -0,0 +1,140 @@
+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 FormMapWithSetWarships : Form
+ {
+ private MapWithSetWarshipsGeneric _mapWarshipsCollectionGeneric;
+ public FormMapWithSetWarships()
+ {
+ InitializeComponent();
+ }
+
+ private void СomboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ AbstractMap map = null;
+
+ switch (comboBoxSelectorMap.Text)
+ {
+ case "Первая карта":
+ map = new SimpleMap();
+ break;
+ case "Вторая карта":
+ map = new Ocean();
+ break;
+ }
+ if (map != null)
+ {
+ _mapWarshipsCollectionGeneric = new MapWithSetWarshipsGeneric(
+ pictureBox1.Width, pictureBox1.Height, map);
+ }
+ else
+ {
+ _mapWarshipsCollectionGeneric = null;
+ }
+ }
+
+
+
+ private void pictureBox1_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ private void ButtonAddWarship_Click(object sender, EventArgs e)
+ {
+ if (_mapWarshipsCollectionGeneric == null)
+ {
+ return;
+ }
+ FormWarship form = new();
+ if (form.ShowDialog() == DialogResult.OK)
+ {
+ DrawningObjectLinkor warship = new(form.SelectedWarship);
+ if (_mapWarshipsCollectionGeneric + warship >= 0)
+ {
+ MessageBox.Show("Объект добавлен");
+ pictureBox1.Image = _mapWarshipsCollectionGeneric.ShowSet();
+ }
+ else
+ {
+ MessageBox.Show("Не удалось добавить объект");
+ }
+ }
+ }
+
+ private void ButtonRemoveWarship_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 (_mapWarshipsCollectionGeneric - pos != null)
+ {
+ MessageBox.Show("Объект удален");
+ pictureBox1.Image = _mapWarshipsCollectionGeneric.ShowSet();
+ }
+ else
+ {
+ MessageBox.Show("Не удалось удалить объект");
+ }
+ }
+
+ private void ButtonShowStorage_Click(object sender, EventArgs e)
+ {
+ if (_mapWarshipsCollectionGeneric == null)
+ {
+ return;
+ }
+ pictureBox1.Image = _mapWarshipsCollectionGeneric.ShowSet();
+ }
+
+ private void ButtonShowOnMap_Click(object sender, EventArgs e)
+ {
+ if (_mapWarshipsCollectionGeneric == null)
+ {
+ return;
+ }
+ pictureBox1.Image = _mapWarshipsCollectionGeneric.ShowOnMap();
+ }
+
+ private void ButtonMove_Click(object sender, EventArgs e)
+ {
+ if (_mapWarshipsCollectionGeneric == null)
+ {
+ 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;
+ }
+ pictureBox1.Image = _mapWarshipsCollectionGeneric.MoveObject(dir);
+ }
+ }
+}
diff --git a/Warship/Warship/FormMapWithSetWarships.resx b/Warship/Warship/FormMapWithSetWarships.resx
new file mode 100644
index 0000000..f298a7b
--- /dev/null
+++ b/Warship/Warship/FormMapWithSetWarships.resx
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/Warship/Warship/IDrawningObject.cs b/Warship/Warship/IDrawningObject.cs
new file mode 100644
index 0000000..7c46da4
--- /dev/null
+++ b/Warship/Warship/IDrawningObject.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Warship
+{
+ internal interface IDrawningObject
+ {
+ /// Шаг перемещения объекта
+ public float Step { get; }
+ /// Установка позиции объекта
+ /// Координата X
+ /// Координата Y
+ /// Ширина полотна
+ /// Высота полотна
+ 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();
+ }
+}
diff --git a/Warship/Warship/MapWithSetWarshipsGeneric.cs b/Warship/Warship/MapWithSetWarshipsGeneric.cs
new file mode 100644
index 0000000..ea97d59
--- /dev/null
+++ b/Warship/Warship/MapWithSetWarshipsGeneric.cs
@@ -0,0 +1,127 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Warship
+{
+ internal class MapWithSetWarshipsGeneric
+ where T : class, IDrawningObject
+ where U : AbstractMap
+ {
+ private readonly int _pictureWidth;
+ private readonly int _pictureHeight;
+ private readonly int _placeSizeWidth = 120;
+ private readonly int _placeSizeHeight = 50;
+ private readonly SetWarshipsGeneric _setWarship;
+ private readonly U _map;
+
+ public MapWithSetWarshipsGeneric(int picWidth, int picHeight, U map)
+ {
+ int width = picWidth / _placeSizeWidth;
+ int height = picHeight / _placeSizeHeight;
+ _setWarship = new SetWarshipsGeneric(width * height);
+ _pictureWidth = picWidth;
+ _pictureHeight = picHeight;
+ _map = map;
+ }
+
+ public static int operator +(MapWithSetWarshipsGeneric map, T warship)
+ {
+ return map._setWarship.Insert(warship);
+ }
+
+ public static T operator -(MapWithSetWarshipsGeneric map, int position)
+ {
+ return map._setWarship.Remove(position);
+ }
+
+ public Bitmap ShowSet()
+ {
+ Bitmap bmp = new(_pictureWidth, _pictureWidth);
+ Graphics gr = Graphics.FromImage(bmp);
+ DrawBackground(gr);
+ DrawWarship(gr);
+ return bmp;
+ }
+
+ public Bitmap ShowOnMap()
+ {
+ Shaking();
+ for (int i = 0; i < _setWarship.Count; i++)
+ {
+ var warship = _setWarship.Get(i);
+ if (warship != null)
+ {
+ return _map.CreateMap(_pictureWidth, _pictureHeight, warship);
+ }
+ }
+ return new(_pictureWidth, _pictureHeight);
+ }
+
+ public Bitmap MoveObject(Direction direction)
+ {
+ if (_map != null)
+ {
+ return _map.MoveObject(direction);
+ }
+ return new(_pictureWidth, _pictureHeight);
+ }
+
+ public void Shaking()
+ {
+ int j = _setWarship.Count - 1;
+ for (int i = 0; i < _setWarship.Count; i++)
+ {
+ if (_setWarship.Get(i) == null)
+ {
+ for (; j > i; j--)
+ {
+ var warship = _setWarship.Get(j);
+ if (warship != null)
+ {
+ _setWarship.Insert(warship, i);
+ _setWarship.Remove(j);
+ break;
+ }
+ }
+ if (j <= i)
+ {
+ return;
+ }
+ }
+ }
+ }
+
+ private void DrawBackground(Graphics gr)
+ {
+ Pen pen = new(Color.Black, 5);
+ for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
+ {
+ for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
+ {
+ gr.DrawLine(pen, i * _placeSizeWidth + 20, j * _placeSizeHeight + 2, i * _placeSizeWidth + (int)(_placeSizeWidth * 0.8), j * _placeSizeHeight + 2);
+ gr.DrawLine(pen, i * _placeSizeWidth + 20, j * _placeSizeHeight + _placeSizeHeight / 2 + 2, i * _placeSizeWidth + (int)(_placeSizeWidth * 0.8), j * _placeSizeHeight + _placeSizeHeight / 2 + 2);
+ gr.DrawLine(pen, i * _placeSizeWidth + (int)(_placeSizeWidth * 0.8), j * _placeSizeHeight + 2, i * _placeSizeWidth + _placeSizeWidth, j * _placeSizeHeight + _placeSizeHeight / 2);
+ gr.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth, j * _placeSizeHeight + _placeSizeHeight / 2, i * _placeSizeWidth + (int)(_placeSizeWidth * 0.8), j * _placeSizeHeight + _placeSizeHeight);
+ }
+ }
+ }
+
+ private void DrawWarship(Graphics gr)
+ {
+ int width = _pictureWidth / _placeSizeWidth;
+ int height = _pictureHeight / _placeSizeHeight;
+
+ for (int i = 0; i < _setWarship.Count; i++)
+ {
+ if (_setWarship.Get(i) != null)
+ {
+ _setWarship.Get(i).SetObject(i % width * _placeSizeWidth, (height - 1 - i / width) * _placeSizeHeight, _pictureWidth, _pictureHeight);
+ _setWarship.Get(i)?.DrawningObject(gr);
+ }
+ }
+ }
+ }
+}
diff --git a/Warship/Warship/Ocean.cs b/Warship/Warship/Ocean.cs
new file mode 100644
index 0000000..4c8b837
--- /dev/null
+++ b/Warship/Warship/Ocean.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Warship
+{
+ internal class Ocean : AbstractMap
+ {
+ /// Цвет участка закрытого
+ private readonly Brush barrierColor = new SolidBrush(Color.White);
+ /// Цвет участка открытого
+ private readonly Brush roadColor = new SolidBrush(Color.FromArgb(0, 0, 139));
+
+ 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 < 15)
+ {
+ int x = _random.Next(0, 100);
+ int y = _random.Next(0, 100);
+ if (_map[x, y] == _freeRoad)
+ {
+ _map[x, y] = _barrier;
+ counter++;
+ }
+ }
+ }
+ }
+}
diff --git a/Warship/Warship/Program.cs b/Warship/Warship/Program.cs
index 8eaf7e5..4c572c2 100644
--- a/Warship/Warship/Program.cs
+++ b/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 Warship());
+ Application.Run(new FormMapWithSetWarships());
}
}
}
\ No newline at end of file
diff --git a/Warship/Warship/SetShipsGeneric.cs b/Warship/Warship/SetShipsGeneric.cs
new file mode 100644
index 0000000..c84987d
--- /dev/null
+++ b/Warship/Warship/SetShipsGeneric.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Warship
+{
+ internal class SetWarshipsGeneric
+ where T : class
+ {
+ private readonly T[] _places;
+
+ public int Count => _places.Length;
+
+ public SetWarshipsGeneric(int count)
+ {
+ _places = new T[count];
+ }
+
+ public int Insert(T warship)
+ {
+ return Insert(warship, 0);
+ }
+
+ public int Insert(T warship, int position)
+ {
+ int EmptyEl = -1;
+
+ if (position >= Count || position < 0)
+ return -1;
+
+ if (_places[position] == null)
+ {
+ _places[position] = warship;
+ return 1;
+ }
+
+ else if (_places[position] != null)
+ {
+ for (int i = position + 1; i < Count; i++)
+ if (_places[i] == null)
+ {
+ EmptyEl = i;
+ break;
+ }
+
+ if (EmptyEl == -1)
+ return -1;
+
+ for (int i = EmptyEl; i > position; i--)
+ _places[i] = _places[i - 1];
+ }
+
+ _places[position] = warship;
+ return 1;
+ }
+
+ public T Remove(int position)
+ {
+ if (position >= Count || position < 0 || _places[position] == null)
+ return null;
+
+ T deleted = _places[position];
+ _places[position] = null;
+ return deleted;
+ }
+
+ public T Get(int position)
+ {
+ if (position >= Count || position < 0)
+ return null;
+
+ return _places[position];
+ }
+ }
+}
diff --git a/Warship/Warship/SimpleMap.cs b/Warship/Warship/SimpleMap.cs
new file mode 100644
index 0000000..dfc55cd
--- /dev/null
+++ b/Warship/Warship/SimpleMap.cs
@@ -0,0 +1,49 @@
+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 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, 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 < 33)
+ {
+ int x = _random.Next(0, 100);
+ int y = _random.Next(0, 100);
+ if (_map[x, y] == _freeRoad)
+ {
+ _map[x, y] = _barrier;
+ counter++;
+ }
+ }
+ }
+ }
+}
diff --git a/Warship/Warship/Warship.Designer.cs b/Warship/Warship/Warship.Designer.cs
deleted file mode 100644
index 0222461..0000000
--- a/Warship/Warship/Warship.Designer.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-namespace Warship
-{
- partial class Warship
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- this.pictureBoxShip = new System.Windows.Forms.PictureBox();
- this.button1 = new System.Windows.Forms.Button();
- this.buttonUp = new System.Windows.Forms.Button();
- this.buttonLeft = new System.Windows.Forms.Button();
- this.buttonRight = new System.Windows.Forms.Button();
- this.buttonDown = new System.Windows.Forms.Button();
- this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
- this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
- this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
- this.statusStrip1 = new System.Windows.Forms.StatusStrip();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).BeginInit();
- this.statusStrip1.SuspendLayout();
- this.SuspendLayout();
- //
- // pictureBoxShip
- //
- this.pictureBoxShip.Dock = System.Windows.Forms.DockStyle.Fill;
- this.pictureBoxShip.Location = new System.Drawing.Point(0, 0);
- this.pictureBoxShip.Name = "pictureBoxShip";
- this.pictureBoxShip.Size = new System.Drawing.Size(884, 439);
- this.pictureBoxShip.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
- this.pictureBoxShip.TabIndex = 1;
- this.pictureBoxShip.TabStop = false;
- this.pictureBoxShip.UseWaitCursor = true;
-
- this.pictureBoxShip.Resize += new System.EventHandler(this.ButtonMove_Click);
- //
- // button1
- //
- this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.button1.Location = new System.Drawing.Point(0, 413);
- this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(75, 30);
- this.button1.TabIndex = 2;
- this.button1.Text = "Создать";
- this.button1.UseVisualStyleBackColor = true;
- this.button1.UseWaitCursor = true;
- this.button1.Click += new System.EventHandler(this.ButtonCreate_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.Zoom;
- this.buttonUp.Location = new System.Drawing.Point(806, 370);
- this.buttonUp.Name = "buttonUp";
- this.buttonUp.Size = new System.Drawing.Size(30, 30);
- this.buttonUp.TabIndex = 3;
- this.buttonUp.UseVisualStyleBackColor = true;
- this.buttonUp.UseWaitCursor = true;
- this.buttonUp.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.Zoom;
- this.buttonLeft.Location = new System.Drawing.Point(770, 406);
- this.buttonLeft.Name = "buttonLeft";
- this.buttonLeft.Size = new System.Drawing.Size(30, 30);
- this.buttonLeft.TabIndex = 4;
- this.buttonLeft.UseVisualStyleBackColor = true;
- this.buttonLeft.UseWaitCursor = true;
- this.buttonLeft.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.Zoom;
- this.buttonRight.Location = new System.Drawing.Point(842, 406);
- this.buttonRight.Name = "buttonRight";
- this.buttonRight.Size = new System.Drawing.Size(30, 30);
- this.buttonRight.TabIndex = 5;
- this.buttonRight.UseVisualStyleBackColor = true;
- this.buttonRight.UseWaitCursor = true;
- this.buttonRight.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::Warship.Properties.Resources.arrowDown;
- this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
- this.buttonDown.Location = new System.Drawing.Point(806, 406);
- this.buttonDown.Name = "buttonDown";
- this.buttonDown.Size = new System.Drawing.Size(30, 30);
- this.buttonDown.TabIndex = 6;
- this.buttonDown.UseVisualStyleBackColor = true;
- this.buttonDown.UseWaitCursor = true;
- this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
- //
- // 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 = "Цвет:";
-
- //
- // statusStrip1
- //
- this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripStatusLabelSpeed,
- this.toolStripStatusLabelWeight,
- this.toolStripStatusLabelBodyColor});
- this.statusStrip1.Location = new System.Drawing.Point(0, 439);
- this.statusStrip1.Name = "statusStrip1";
- this.statusStrip1.Size = new System.Drawing.Size(884, 22);
- this.statusStrip1.TabIndex = 0;
- this.statusStrip1.Text = "statusStrip1";
- this.statusStrip1.UseWaitCursor = true;
-
- //
- // Warship
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(884, 461);
- this.Controls.Add(this.buttonDown);
- this.Controls.Add(this.buttonRight);
- this.Controls.Add(this.buttonLeft);
- this.Controls.Add(this.buttonUp);
- this.Controls.Add(this.button1);
- this.Controls.Add(this.pictureBoxShip);
- this.Controls.Add(this.statusStrip1);
- this.Name = "Warship";
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
- this.Text = "Form1";
- this.UseWaitCursor = true;
-
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).EndInit();
- this.statusStrip1.ResumeLayout(false);
- this.statusStrip1.PerformLayout();
- this.ResumeLayout(false);
- this.PerformLayout();
-
- }
-
- #endregion
- private PictureBox pictureBoxShip;
- private Button button1;
- private Button buttonUp;
- private Button buttonLeft;
- private Button buttonRight;
- private Button buttonDown;
- private ToolStripStatusLabel toolStripStatusLabelSpeed;
- private ToolStripStatusLabel toolStripStatusLabelWeight;
- private ToolStripStatusLabel toolStripStatusLabelBodyColor;
- private StatusStrip statusStrip1;
- }
-}
\ No newline at end of file
diff --git a/Warship/Warship/Warship.cs b/Warship/Warship/Warship.cs
deleted file mode 100644
index 40665e3..0000000
--- a/Warship/Warship/Warship.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-namespace Warship
-{
- public partial class Warship : Form
-
- {
- private DrawningShip _ship;
- public Warship()
- {
- InitializeComponent();
- }
-
- private void Draw()
- {
- Bitmap bmp = new(pictureBoxShip.Width, pictureBoxShip.Height);
- Graphics gr = Graphics.FromImage(bmp);
- _ship?.DrawTransport(gr);
- pictureBoxShip.Image = bmp;
- }
- ///
- /// ""
- ///
- ///
- ///
- private void ButtonCreate_Click(object sender, EventArgs e)
- {
- Random rnd = new();
- _ship = new DrawningShip();
- _ship.Init(rnd.Next(100, 300), rnd.Next(1000, 2000),
- Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
- _ship.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100),
- pictureBoxShip.Width, pictureBoxShip.Height);
- toolStripStatusLabelSpeed.Text = $": {_ship.Ship.Speed}";
- toolStripStatusLabelWeight.Text = $": {_ship.Ship.Weight}";
- toolStripStatusLabelBodyColor.Text = $":" +
- $"{_ship.Ship.BodyColor.Name}";
-
- Draw();
- }
-
-
-
-
- private void ButtonMove_Click(object sender, EventArgs e)
- {
- string name = ((Button)sender)?.Name ?? string.Empty;
- switch (name)
- {
- case "buttonUp":
- _ship?.MoveTransport(Direction.Up);
- break;
- case "buttonDown":
- _ship?.MoveTransport(Direction.Down);
- break;
- case "buttonLeft":
- _ship?.MoveTransport(Direction.Left);
- break;
- case "buttonRight":
- _ship?.MoveTransport(Direction.Right);
- break;
- }
- Draw();
- }
- ///
- ///
- ///
- ///
- ///
- private void PictureBoxCar_Resize(object sender, EventArgs e)
- {
- _ship?.ChangeBorders(pictureBoxShip.Width, pictureBoxShip.Height);
- Draw();
- }
-
-
- }
-}
\ No newline at end of file
diff --git a/Warship/Warship/Warship.csproj b/Warship/Warship/Warship.csproj
index 13ee123..6ace4d3 100644
--- a/Warship/Warship/Warship.csproj
+++ b/Warship/Warship/Warship.csproj
@@ -8,6 +8,10 @@
enable
+
+
+
+
True