diff --git a/ProjectContainerShip/ProjectContainerShip/DrawningContainerShip.cs b/ProjectContainerShip/ProjectContainerShip/DrawningContainerShip.cs
deleted file mode 100644
index 394acb2..0000000
--- a/ProjectContainerShip/ProjectContainerShip/DrawningContainerShip.cs
+++ /dev/null
@@ -1,235 +0,0 @@
-using ProjectContainerShip;
-using System.Drawing;
-
-namespace ProjectContainerShip;
-
-///
-/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
-///
-public class DrawningContainerShip
-{
- ///
- /// Класс-сущность
- ///
- public EntityContainerShip? EntityContainerShip { get; private set; }
-
- ///
- /// Ширина окна
- ///
- private int? _pictureWidth;
-
- ///
- /// Высота окна
- ///
- private int? _pictureHeight;
-
- ///
- /// Левая координата прорисовки контейнеровоза
- ///
- private int? _startPosX;
-
- ///
- /// Верхняя кооридната прорисовки контейнеровоза
- ///
- private int? _startPosY;
-
- ///
- /// Ширина прорисовки контейнеровоза
- ///
- private readonly int _drawningShipWidth = 130;
-
- ///
- /// Высота прорисовки контейнеровоза
- ///
- private readonly int _drawningShipHeight = 85;
-
- ///
- /// Инициализация свойств
- ///
- /// Скорость
- /// Вес
- /// Основной цвет
- /// Дополнительный цвет
- /// Признак наличия контейнеров
- /// Признак наличия крана
- public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool container, bool Crane)
- {
- EntityContainerShip = new EntityContainerShip();
- EntityContainerShip.Init(speed, weight, bodyColor, additionalColor, container, Crane);
- _pictureWidth = null;
- _pictureHeight = null;
- _startPosX = null;
- _startPosY = null;
- }
-
- ///
- /// Установка границ поля
- ///
- /// Ширина поля
- /// Высота поля
- /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах
- public bool SetPictureSize(int width, int height)
- {
- // TODO проверка, что объект "влезает" в размеры поля
- if ((width < _drawningShipWidth) || (height < _drawningShipHeight))
- {
- return false;
- }
- // если влезает, сохраняем границы и корректируем позицию объекта, если она была уже установлена
- _pictureWidth = width;
- _pictureHeight = height;
-
- if (_startPosX.HasValue && (_startPosX.Value + _drawningShipWidth > _pictureWidth))
- {
- _startPosX = _pictureWidth - _drawningShipWidth;
- }
-
- if (_startPosY.HasValue && (_startPosY + _drawningShipHeight > _pictureHeight))
- {
- _startPosY = _pictureHeight - _drawningShipHeight;
- }
-
- return true;
-}
-
- ///
- /// Установка позиции
- ///
- /// Координата X
- /// Координата Y
- public void SetPosition(int x, int y)
- {
- _startPosX = x;
- _startPosY = y;
- if (_startPosX + _drawningShipWidth > _pictureWidth)
- {
- _startPosX = _pictureWidth - _drawningShipWidth;
- }
-
- if (_startPosX < 0)
- {
- _startPosX = 0;
- }
-
- if (_startPosY + _drawningShipHeight > _pictureHeight)
- {
- _startPosY = _pictureHeight - _drawningShipHeight;
- }
-
- if (_startPosY < 0)
- {
- _startPosY = 0;
- }
- }
-
- ///
- /// Изменение направления перемещения
- ///
- /// Направление
- /// true - перемещене выполнено, false - перемещение невозможно
- public bool MoveTransport(DirectionType direction)
- {
- if (EntityContainerShip == null || !_startPosX.HasValue || !_startPosY.HasValue)
- {
- return false;
- }
-
- switch (direction)
- {
- //влево
- case DirectionType.Left:
- if (_startPosX.Value - EntityContainerShip.Step > 0)
- {
- _startPosX -= (int)EntityContainerShip.Step;
- }
- return true;
- //вверх
- case DirectionType.Up:
- if (_startPosY.Value - EntityContainerShip.Step > 0)
- {
- _startPosY -= (int)EntityContainerShip.Step;
- }
- return true;
- // вправо
- case DirectionType.Right:
- //TODO прописать логику сдвига в право
- if (_startPosX.Value + EntityContainerShip.Step + _drawningShipWidth < _pictureWidth)
- {
- _startPosX += (int)EntityContainerShip.Step;
- }
- return true;
- //вниз
- case DirectionType.Down:
- //TODO прописать логику сдвига в вниз
- if (_startPosY.Value + EntityContainerShip.Step + _drawningShipHeight < _pictureHeight)
- {
- _startPosY += (int)EntityContainerShip.Step;
- }
- return true;
- default:
- return false;
- }
- }
-
- ///
- /// Прорисовка объекта
- ///
- ///
- public void DrawTransport(Graphics g)
- {
- if (EntityContainerShip == null || !_startPosX.HasValue || !_startPosY.HasValue)
- {
- return;
- }
-
- Pen pen = new(Color.Black);
- Brush additionalBrush = new SolidBrush(EntityContainerShip.AdditionalColor);
-
- // контейнеры
-
- if (EntityContainerShip.Container)
- {
- g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 55, 40, 5);
- g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 55, 40, 5);
- g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 50, 40, 5);
- g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 45, 40, 5);
- g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 45, 40, 5);
- g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 50, 40, 5);
- }
-
- //границы лодки
-
- g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value + 80, 120, 10);
- g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 60, 110, 20);
- g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value + 60, 25, 25);
- g.DrawEllipse(pen, _startPosX.Value + 105, _startPosY.Value + 60, 25, 25);
-
- //кузов
-
- Brush br = new SolidBrush(EntityContainerShip.BodyColor);
-
- g.FillRectangle(br, _startPosX.Value + 5, _startPosY.Value + 80, 120, 10);
- g.FillRectangle(br, _startPosX.Value + 10, _startPosY.Value + 60, 110, 20);
- g.FillEllipse(br, _startPosX.Value, _startPosY.Value + 60, 25, 25);
- g.FillEllipse(br, _startPosX.Value + 105, _startPosY.Value + 60, 25, 25);
-
- //палуба
-
- g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 30, 30, 30);
- g.FillRectangle(br, _startPosX.Value + 20, _startPosY.Value + 30, 30, 30);
-
- // кран
-
- if (EntityContainerShip.Crane)
- {
- g.DrawRectangle(pen, _startPosX.Value + 105, _startPosY.Value + 15, 15, 45);
- g.DrawRectangle(pen, _startPosX.Value + 75, _startPosY.Value + 17, 30, 7);
- g.DrawRectangle(pen, _startPosX.Value + 80, _startPosY.Value + 24, 5, 15);
- g.FillRectangle(additionalBrush, _startPosX.Value + 105, _startPosY.Value + 15, 15, 45);
- g.FillRectangle(additionalBrush, _startPosX.Value + 75, _startPosY.Value + 17, 30, 7);
- g.FillRectangle(additionalBrush, _startPosX.Value + 80, _startPosY.Value + 24, 5, 15);
- }
- }
-
-
-}
diff --git a/ProjectContainerShip/ProjectContainerShip/Drawnings/DirectionType.cs b/ProjectContainerShip/ProjectContainerShip/Drawnings/DirectionType.cs
new file mode 100644
index 0000000..8cdd540
--- /dev/null
+++ b/ProjectContainerShip/ProjectContainerShip/Drawnings/DirectionType.cs
@@ -0,0 +1,32 @@
+namespace ProjectContainerShip.Drawnings;
+
+///
+/// Направление перемещения
+///
+public enum DirectionType
+{
+ ///
+ /// Неизвестное направление
+ ///
+ Unknow = -1,
+
+ ///
+ /// Вверх
+ ///
+ Up = 1,
+
+ ///
+ /// Вниз
+ ///
+ Down = 2,
+
+ ///
+ /// Влево
+ ///
+ Left = 3,
+
+ ///
+ /// Вправо
+ ///
+ Right = 4
+}
\ No newline at end of file
diff --git a/ProjectContainerShip/ProjectContainerShip/Drawnings/DrawningContainerShip.cs b/ProjectContainerShip/ProjectContainerShip/Drawnings/DrawningContainerShip.cs
new file mode 100644
index 0000000..4ebbc83
--- /dev/null
+++ b/ProjectContainerShip/ProjectContainerShip/Drawnings/DrawningContainerShip.cs
@@ -0,0 +1,67 @@
+using ProjectContainerShip.Entities;
+
+namespace ProjectContainerShip.Drawnings;
+
+///
+/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
+///
+public class DrawningContainerShip : DrawningShip
+{
+
+ ///
+ /// Конструктор
+ ///
+ /// Скорость
+ /// Вес
+ /// Цвет палубы
+ /// Дополнительный цвет
+ /// Признак наличия крана
+ /// Признак наличия контейнеров
+ public DrawningContainerShip(int speed, double weight, Color bodyColor, Color additionalColor, bool crane, bool container) : base(125, 60)
+ {
+ EntityShip = new EntityContainerShip(speed, weight, bodyColor, additionalColor, crane, container);
+ }
+ /// true - объект создан, false - проверка не пройдена, нельзя создать объект в этих размерах
+ public override void DrawTransport(Graphics g)
+ {
+ if (EntityShip == null || EntityShip is not EntityContainerShip containerShip || !_startPosX.HasValue || !_startPosY.HasValue)
+ {
+ return;
+ }
+
+ Pen pen = new(Color.Black);
+ Brush additionalBrush = new SolidBrush(containerShip.AdditionalColor);
+
+ base.DrawTransport(g);
+ _startPosX -= 5;
+ _startPosY -= 30;
+
+ // контейнеры
+ if (containerShip.Container)
+ {
+ g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 55, 40, 5);
+ g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 55, 40, 5);
+ g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 50, 40, 5);
+ g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 50, 40, 5);
+ g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 45, 40, 5);
+ g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 45, 40, 5);
+ }
+
+ // кран
+ if (containerShip.Crane)
+ {
+ g.DrawRectangle(pen, _startPosX.Value + 105, _startPosY.Value + 22, 15, 38);
+ g.DrawRectangle(pen, _startPosX.Value + 75, _startPosY.Value + 22, 30, 7);
+ g.DrawRectangle(pen, _startPosX.Value + 80, _startPosY.Value + 29, 5, 15);
+ g.FillRectangle(additionalBrush, _startPosX.Value + 105, _startPosY.Value + 22, 15, 38);
+ g.FillRectangle(additionalBrush, _startPosX.Value + 75, _startPosY.Value + 22, 30, 7);
+ g.FillRectangle(additionalBrush, _startPosX.Value + 80, _startPosY.Value + 29, 5, 15);
+
+ }
+
+ _startPosX += 5;
+ _startPosY += 30;
+
+
+ }
+}
diff --git a/ProjectContainerShip/ProjectContainerShip/Drawnings/DrawningShip.cs b/ProjectContainerShip/ProjectContainerShip/Drawnings/DrawningShip.cs
new file mode 100644
index 0000000..bd9d263
--- /dev/null
+++ b/ProjectContainerShip/ProjectContainerShip/Drawnings/DrawningShip.cs
@@ -0,0 +1,233 @@
+using ProjectContainerShip.Entities;
+
+
+namespace ProjectContainerShip.Drawnings;
+
+///
+/// Класс, отвечающий за прорисовку и перемещение базового объекта-сущности
+///
+public class DrawningShip
+{
+ ///
+ /// Класс-сущность
+ ///
+ public EntityShip? EntityShip { get; protected set; }
+
+ ///
+ /// Ширина окна
+ ///
+ private int? _pictureWidth;
+
+ ///
+ /// Высота окна
+ ///
+ private int? _pictureHeight;
+
+ ///
+ /// Левая координата прорисовки корабля
+ ///
+ protected int? _startPosX;
+
+ ///
+ /// Верхняя кооридната прорисовки корабля
+ ///
+ protected int? _startPosY;
+
+ ///
+ /// Ширина прорисовки корабля
+ ///
+ private readonly int _drawningShipWidth = 125;
+
+ ///
+ /// Высота прорисовки корабля
+ ///
+ private readonly int _drawningShipHeight = 60;
+
+ ///
+ /// Координата X объекта
+ ///
+ public int? GetPosX => _startPosX;
+
+ ///
+ /// Координата Y объекта
+ ///
+ public int? GetPosY => _startPosY;
+
+ ///
+ /// Ширина объекта
+ ///
+ public int GetWidth => _drawningShipWidth;
+
+ ///
+ /// Высота объекта
+ ///
+ public int GetHeight => _drawningShipHeight;
+
+ ///
+ /// Пустой конструктор
+ ///
+ private DrawningShip()
+ {
+ _pictureWidth = null;
+ _pictureHeight = null;
+ _startPosX = null;
+ _startPosY = null;
+ }
+
+ ///
+ /// Конструктор
+ ///
+ /// Скорость
+ /// Вес
+ /// Основной цвет
+ public DrawningShip(int speed, double weight, Color bodyColor) : this()
+ {
+ EntityShip = new EntityShip(speed, weight, bodyColor);
+ }
+
+ ///
+ /// Конструктор для наследников
+ ///
+ /// Ширина прорисовки автомобиля
+ /// Высота прорисовки автомобиля
+ protected DrawningShip(int drawningShipWidth, int drawningShipHeight) : this()
+ {
+ _drawningShipWidth = drawningShipWidth;
+ _pictureHeight = drawningShipHeight;
+ }
+
+ ///
+ /// Установка границ поля
+ ///
+ /// Ширина поля
+ /// Высота поля
+ /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах
+ public bool SetPictureSize(int width, int height)
+ {
+ // TODO проверка, что объект "влезает" в размеры поля
+ if ((width < _drawningShipWidth) || (height < _drawningShipHeight))
+ {
+ return false;
+ }
+ // если влезает, сохраняем границы и корректируем позицию объекта, если она была уже установлена
+ _pictureWidth = width;
+ _pictureHeight = height;
+
+ if (_startPosX.HasValue && (_startPosX.Value + _drawningShipWidth > _pictureWidth))
+ {
+ _startPosX = _pictureWidth - _drawningShipWidth;
+ }
+
+ if (_startPosY.HasValue && (_startPosY + _drawningShipHeight > _pictureHeight))
+ {
+ _startPosY = _pictureHeight - _drawningShipHeight;
+ }
+
+ return true;
+ }
+
+ ///
+ /// Установка позиции
+ ///
+ /// Координата X
+ /// Координата Y
+ public void SetPosition(int x, int y)
+ {
+ if (EntityShip == null) return;
+ while (x + _drawningShipWidth > _pictureWidth)
+ {
+ x -= (int)EntityShip.Step;
+ }
+ while (x < 0)
+ {
+ x += (int)EntityShip.Step;
+ }
+ while (y + _drawningShipHeight > _pictureHeight)
+ {
+ y -= (int)EntityShip.Step;
+ }
+ while (y < 0)
+ {
+ y += (int)EntityShip.Step;
+ }
+ _startPosX = x;
+ _startPosY = y;
+ }
+
+ ///
+ /// Изменение направления перемещения
+ ///
+ /// Направление
+ public bool MoveTransport(DirectionType direction)
+ {
+ if (EntityShip == null || !_startPosX.HasValue || !_startPosY.HasValue)
+ {
+ return false;
+ }
+ switch (direction)
+ {
+ //влево
+ case DirectionType.Left:
+ if (_startPosX.Value - EntityShip.Step > 0)
+ {
+ _startPosX -= (int)EntityShip.Step;
+ }
+ return true;
+ //вверх
+ case DirectionType.Up:
+ if (_startPosY.Value - EntityShip.Step > 0)
+ {
+ _startPosY -= (int)EntityShip.Step;
+ }
+ return true;
+ // вправо
+ case DirectionType.Right:
+ if (_startPosX + _drawningShipWidth + EntityShip.Step < _pictureWidth)
+ {
+ _startPosX += (int)EntityShip.Step;
+ }
+ return true;
+ //вниз
+ case DirectionType.Down:
+ if (_startPosY + _drawningShipHeight + EntityShip.Step < _pictureHeight)
+ {
+ _startPosY += (int)EntityShip.Step;
+ }
+ return true;
+ default:
+ return false;
+ }
+ }
+
+ ///
+ /// Прорисовка объекта
+ ///
+ ///
+ public virtual void DrawTransport(Graphics g)
+ {
+ if (EntityShip == null || !_startPosX.HasValue || !_startPosY.HasValue)
+ {
+ return;
+ }
+ //незабыть смещение к границе лев.верх.
+ Pen pen = new(Color.Black);
+
+ //границы лодки
+ g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 50, 120, 10);
+ g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value + 30, 110, 20);
+ g.DrawEllipse(pen, _startPosX.Value - 5, _startPosY.Value + 30, 25, 25);
+ g.DrawEllipse(pen, _startPosX.Value + 100, _startPosY.Value + 30, 25, 25);
+
+ //кузов
+ Brush br = new SolidBrush(EntityShip.BodyColor);
+
+ g.FillRectangle(br, _startPosX.Value, _startPosY.Value + 50, 120, 10);
+ g.FillRectangle(br, _startPosX.Value + 5, _startPosY.Value + 30, 110, 20);
+ g.FillEllipse(br, _startPosX.Value - 5, _startPosY.Value + 30, 25, 25);
+ g.FillEllipse(br, _startPosX.Value + 100, _startPosY.Value + 30, 25, 25);
+
+ //палуба
+ g.DrawRectangle(pen, _startPosX.Value + 15, _startPosY.Value, 30, 30);
+ g.FillRectangle(br, _startPosX.Value + 15, _startPosY.Value, 30, 30);
+ }
+}
\ No newline at end of file
diff --git a/ProjectContainerShip/ProjectContainerShip/EntityContainerShip.cs b/ProjectContainerShip/ProjectContainerShip/Entities/EntityContainerShip.cs
similarity index 56%
rename from ProjectContainerShip/ProjectContainerShip/EntityContainerShip.cs
rename to ProjectContainerShip/ProjectContainerShip/Entities/EntityContainerShip.cs
index 5a33769..81a0511 100644
--- a/ProjectContainerShip/ProjectContainerShip/EntityContainerShip.cs
+++ b/ProjectContainerShip/ProjectContainerShip/Entities/EntityContainerShip.cs
@@ -1,63 +1,38 @@
-
-namespace ProjectContainerShip;
+namespace ProjectContainerShip.Entities;
///
/// Класс-сущность "Контейнеровоз"
///
-public class EntityContainerShip
+public class EntityContainerShip : EntityShip
{
- ///
- /// Скорость
- ///
- public int Speed { get; private set; }
-
- ///
- /// Вес
- ///
- public double Weight { get; private set; }
-
- ///
- /// Основной цвет
- ///
- public Color BodyColor { get; private set; }
-
///
/// Дополнительный цвет (для опциональных элементов)
///
public Color AdditionalColor { get; private set; }
- ///
- /// Признак (опция) наличия Контейнеров
- ///
- public bool Container { get; private set; }
-
///
/// Признак (опция) наличия крана
///
public bool Crane { get; private set; }
-
///
- /// Шаг перемещения контейнеровоза
+ /// Признак (опция) наличия дополнительных контейнеров
///
- public double Step => Speed * 100 / Weight;
+ public bool Container { get; private set; }
///
/// Инициализация полей объекта-класса контейнеровоза
///
/// Скорость
- /// Вес контейнеровоза
+ /// Вес
/// Основной цвет
/// Дополнительный цвет
- /// Признак наличия контейнеров
/// Признак наличия крана
- public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool container, bool crane)
+ /// Признак наличия контейнеров
+ public EntityContainerShip(int speed, double weight, Color bodyColor, Color additionalColor, bool crane, bool container) : base(speed, weight, Color.Black)
{
- Speed = speed;
- Weight = weight;
- BodyColor = bodyColor;
AdditionalColor = additionalColor;
- Container = container;
Crane = crane;
+ Container = container;
}
}
\ No newline at end of file
diff --git a/ProjectContainerShip/ProjectContainerShip/Entities/EntityShip.cs b/ProjectContainerShip/ProjectContainerShip/Entities/EntityShip.cs
new file mode 100644
index 0000000..d223d46
--- /dev/null
+++ b/ProjectContainerShip/ProjectContainerShip/Entities/EntityShip.cs
@@ -0,0 +1,42 @@
+namespace ProjectContainerShip.Entities;
+
+
+///
+/// Класс-сущность "Корабль"
+///
+public class EntityShip
+{
+
+ ///
+ /// Скорость
+ ///
+ public int Speed { get; private set; }
+
+ ///
+ /// Вес
+ ///
+ public double Weight { get; private set; }
+
+ ///
+ /// Основной цвет
+ ///
+ public Color BodyColor { get; private set; }
+
+ ///
+ /// Шаг перемещения корабля
+ ///
+ public double Step => (double)Speed * 100 / Weight;
+
+ ///
+ /// Конструктор с параметрами
+ ///
+ /// Скорость
+ /// Вес корабля
+ /// Основной цвет
+ public EntityShip(int speed, double weight, Color bodyColor)
+ {
+ Speed = speed;
+ Weight = weight;
+ BodyColor = bodyColor;
+ }
+}
\ No newline at end of file
diff --git a/ProjectContainerShip/ProjectContainerShip/FormContainerShip.Designer.cs b/ProjectContainerShip/ProjectContainerShip/FormContainerShip.Designer.cs
index 0ee6a08..5ab38c5 100644
--- a/ProjectContainerShip/ProjectContainerShip/FormContainerShip.Designer.cs
+++ b/ProjectContainerShip/ProjectContainerShip/FormContainerShip.Designer.cs
@@ -38,6 +38,9 @@ namespace ProjectContainerShip
buttonUp = new Button();
buttonDown = new Button();
buttonRight = new Button();
+ buttonCreateShip = new Button();
+ comboBoxStrategy = new ComboBox();
+ buttonStrategyStep = new Button();
((System.ComponentModel.ISupportInitialize)pictureBoxContainerShip).BeginInit();
SuspendLayout();
//
@@ -46,18 +49,18 @@ namespace ProjectContainerShip
pictureBoxContainerShip.Dock = DockStyle.Fill;
pictureBoxContainerShip.Location = new Point(0, 0);
pictureBoxContainerShip.Name = "pictureBoxContainerShip";
- pictureBoxContainerShip.Size = new Size(923, 597);
+ pictureBoxContainerShip.Size = new Size(934, 586);
pictureBoxContainerShip.TabIndex = 0;
pictureBoxContainerShip.TabStop = false;
//
// buttonCreateContainerShip
//
buttonCreateContainerShip.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
- buttonCreateContainerShip.Location = new Point(12, 562);
+ buttonCreateContainerShip.Location = new Point(12, 546);
buttonCreateContainerShip.Name = "buttonCreateContainerShip";
- buttonCreateContainerShip.Size = new Size(75, 23);
+ buttonCreateContainerShip.Size = new Size(196, 26);
buttonCreateContainerShip.TabIndex = 1;
- buttonCreateContainerShip.Text = "Создать";
+ buttonCreateContainerShip.Text = "Создать контейнеровоз";
buttonCreateContainerShip.UseVisualStyleBackColor = true;
buttonCreateContainerShip.Click += ButtonCreateContainerShip_Click;
//
@@ -66,9 +69,9 @@ namespace ProjectContainerShip
buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
buttonLeft.BackgroundImage = Properties.Resources.arrowLeft;
buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
- buttonLeft.Location = new Point(787, 550);
+ buttonLeft.Location = new Point(798, 532);
buttonLeft.Name = "buttonLeft";
- buttonLeft.Size = new Size(35, 35);
+ buttonLeft.Size = new Size(35, 40);
buttonLeft.TabIndex = 2;
buttonLeft.UseVisualStyleBackColor = true;
buttonLeft.Click += ButtonMove_Click;
@@ -78,9 +81,9 @@ namespace ProjectContainerShip
buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
buttonUp.BackgroundImage = Properties.Resources.arrowUp;
buttonUp.BackgroundImageLayout = ImageLayout.Stretch;
- buttonUp.Location = new Point(828, 509);
+ buttonUp.Location = new Point(839, 486);
buttonUp.Name = "buttonUp";
- buttonUp.Size = new Size(35, 35);
+ buttonUp.Size = new Size(35, 40);
buttonUp.TabIndex = 3;
buttonUp.UseVisualStyleBackColor = true;
buttonUp.Click += ButtonMove_Click;
@@ -90,9 +93,9 @@ namespace ProjectContainerShip
buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
buttonDown.BackgroundImage = Properties.Resources.arrowDown;
buttonDown.BackgroundImageLayout = ImageLayout.Stretch;
- buttonDown.Location = new Point(828, 550);
+ buttonDown.Location = new Point(839, 532);
buttonDown.Name = "buttonDown";
- buttonDown.Size = new Size(35, 35);
+ buttonDown.Size = new Size(35, 40);
buttonDown.TabIndex = 4;
buttonDown.UseVisualStyleBackColor = true;
buttonDown.Click += ButtonMove_Click;
@@ -102,18 +105,52 @@ namespace ProjectContainerShip
buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
buttonRight.BackgroundImage = Properties.Resources.arrowRight;
buttonRight.BackgroundImageLayout = ImageLayout.Stretch;
- buttonRight.Location = new Point(869, 550);
+ buttonRight.Location = new Point(880, 532);
buttonRight.Name = "buttonRight";
- buttonRight.Size = new Size(35, 35);
+ buttonRight.Size = new Size(35, 40);
buttonRight.TabIndex = 5;
buttonRight.UseVisualStyleBackColor = true;
buttonRight.Click += ButtonMove_Click;
//
+ // buttonCreateShip
+ //
+ buttonCreateShip.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+ buttonCreateShip.Location = new Point(214, 546);
+ buttonCreateShip.Name = "buttonCreateShip";
+ buttonCreateShip.Size = new Size(196, 26);
+ buttonCreateShip.TabIndex = 6;
+ buttonCreateShip.Text = "Создать корабль";
+ buttonCreateShip.UseVisualStyleBackColor = true;
+ buttonCreateShip.Click +=ButtonCreateShip_Click;
+ //
+ // comboBoxStrategy
+ //
+ comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+ comboBoxStrategy.FormattingEnabled = true;
+ comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+ comboBoxStrategy.Location = new Point(801, 12);
+ comboBoxStrategy.Name = "comboBoxStrategy";
+ comboBoxStrategy.Size = new Size(121, 25);
+ comboBoxStrategy.TabIndex = 7;
+ //
+ // buttonStrategyStep
+ //
+ buttonStrategyStep.Location = new Point(839, 43);
+ buttonStrategyStep.Name = "buttonStrategyStep";
+ buttonStrategyStep.Size = new Size(75, 23);
+ buttonStrategyStep.TabIndex = 8;
+ buttonStrategyStep.Text = "Шаг";
+ buttonStrategyStep.UseVisualStyleBackColor = true;
+ buttonStrategyStep.Click += ButtonStrategyStep_Click;
+ //
// FormContainerShip
//
- AutoScaleDimensions = new SizeF(7F, 15F);
+ AutoScaleDimensions = new SizeF(7F, 17F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(923, 597);
+ ClientSize = new Size(934, 586);
+ Controls.Add(buttonStrategyStep);
+ Controls.Add(comboBoxStrategy);
+ Controls.Add(buttonCreateShip);
Controls.Add(buttonRight);
Controls.Add(buttonDown);
Controls.Add(buttonUp);
@@ -134,5 +171,9 @@ namespace ProjectContainerShip
private Button buttonUp;
private Button buttonDown;
private Button buttonRight;
+ private Button button1;
+ private Button buttonCreateShip;
+ private ComboBox comboBoxStrategy;
+ private Button buttonStrategyStep;
}
}
\ No newline at end of file
diff --git a/ProjectContainerShip/ProjectContainerShip/FormContainerShip.cs b/ProjectContainerShip/ProjectContainerShip/FormContainerShip.cs
index 9a06fcd..4ff8e6b 100644
--- a/ProjectContainerShip/ProjectContainerShip/FormContainerShip.cs
+++ b/ProjectContainerShip/ProjectContainerShip/FormContainerShip.cs
@@ -1,4 +1,5 @@
-using ProjectContainerShip;
+using ProjectContainerShip.Drawnings;
+using ProjectContainerShip.MovementStrategy;
namespace ProjectContainerShip;
@@ -10,7 +11,12 @@ public partial class FormContainerShip : Form
///
/// Поле-объект для прорисовки объекта
///
- private DrawningContainerShip? _drawningContainerShip;
+ private DrawningShip? _drawningShip;
+
+ ///
+ /// Стратегия перемещения
+ ///
+ private AbstractStrategy? _strategy;
///
/// Конструктор формы
@@ -18,6 +24,7 @@ public partial class FormContainerShip : Form
public FormContainerShip()
{
InitializeComponent();
+ _strategy = null;
}
///
@@ -25,34 +32,60 @@ public partial class FormContainerShip : Form
///
private void Draw()
{
- if (_drawningContainerShip == null)
+ if (_drawningShip == null)
{
return;
}
Bitmap bmp = new(pictureBoxContainerShip.Width, pictureBoxContainerShip.Height);
Graphics gr = Graphics.FromImage(bmp);
- _drawningContainerShip.DrawTransport(gr);
+ _drawningShip.DrawTransport(gr);
pictureBoxContainerShip.Image = bmp;
}
///
- /// Обработка нажатия кнопки "Создать"
+ /// Создание объекта класса-перемещения
+ ///
+ /// Тип создаваемого объекта
+ private void CreateObject(string type)
+ {
+ Random random = new();
+ switch (type)
+ {
+ case nameof(DrawningShip):
+ _drawningShip = new DrawningShip(random.Next(100, 300), random.Next(1000, 3000),
+ Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)));
+ break;
+ case nameof(DrawningContainerShip):
+ _drawningShip = new DrawningContainerShip(random.Next(100, 300), random.Next(1000, 3000),
+ Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+ Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+ Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+ break;
+ default:
+ return;
+ }
+
+ _drawningShip.SetPictureSize(pictureBoxContainerShip.Width, pictureBoxContainerShip.Height);
+ _drawningShip.SetPosition(random.Next(10, 100), random.Next(10, 100));
+ _strategy = null;
+ comboBoxStrategy.Enabled = true;
+ Draw();
+ }
+
+ ///
+ /// Обработка нажатия кнопки "Создать спортивный автомобиль"
///
///
///
- private void ButtonCreateContainerShip_Click(object sender, EventArgs e)
- {
- Random random = new();
- _drawningContainerShip = new DrawningContainerShip();
- _drawningContainerShip.Init(random.Next(100, 300), random.Next(1000, 3000),
- Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
- Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
- Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
- _drawningContainerShip.SetPictureSize(pictureBoxContainerShip.Width, pictureBoxContainerShip.Height);
- _drawningContainerShip.SetPosition(random.Next(10, 100), random.Next(10, 100));
- Draw();
- }
+ private void ButtonCreateContainerShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningContainerShip));
+
+ ///
+ /// Обработка нажатия кнопки "Создать автомобиль"
+ ///
+ ///
+ ///
+ private void ButtonCreateShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningShip));
///
/// Перемещение объекта по форме (нажатие кнопок навигации)
@@ -61,7 +94,7 @@ public partial class FormContainerShip : Form
///
private void ButtonMove_Click(object sender, EventArgs e)
{
- if (_drawningContainerShip == null)
+ if (_drawningShip == null)
{
return;
}
@@ -71,16 +104,16 @@ public partial class FormContainerShip : Form
switch (name)
{
case "buttonUp":
- result = _drawningContainerShip.MoveTransport(DirectionType.Up);
+ result = _drawningShip.MoveTransport(DirectionType.Up);
break;
case "buttonDown":
- result = _drawningContainerShip.MoveTransport(DirectionType.Down);
+ result = _drawningShip.MoveTransport(DirectionType.Down);
break;
case "buttonLeft":
- result = _drawningContainerShip.MoveTransport(DirectionType.Left);
+ result = _drawningShip.MoveTransport(DirectionType.Left);
break;
case "buttonRight":
- result = _drawningContainerShip.MoveTransport(DirectionType.Right);
+ result = _drawningShip.MoveTransport(DirectionType.Right);
break;
}
@@ -89,4 +122,47 @@ public partial class FormContainerShip : Form
Draw();
}
}
-}
\ No newline at end of file
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ private void ButtonStrategyStep_Click(object sender, EventArgs e)
+ {
+ if (_drawningShip == null)
+ {
+ return;
+ }
+
+ if (comboBoxStrategy.Enabled)
+ {
+ _strategy = comboBoxStrategy.SelectedIndex switch
+ {
+ 0 => new MoveToCenter(),
+ 1 => new MoveToBorder(),
+ _ => null,
+ };
+ if (_strategy == null)
+ {
+ return;
+ }
+ _strategy.SetData(new MoveableShip(_drawningShip), pictureBoxContainerShip.Width, pictureBoxContainerShip.Height);
+ }
+
+ if (_strategy == null)
+ {
+ return;
+ }
+
+ comboBoxStrategy.Enabled = false;
+ _strategy.MakeStep();
+ Draw();
+
+ if (_strategy.GetStatus() == StrategyStatus.Finish)
+ {
+ comboBoxStrategy.Enabled = true;
+ _strategy = null;
+ }
+ }
+}
diff --git a/ProjectContainerShip/ProjectContainerShip/MovementStrategy/AbstractStrategy.cs b/ProjectContainerShip/ProjectContainerShip/MovementStrategy/AbstractStrategy.cs
new file mode 100644
index 0000000..24f6176
--- /dev/null
+++ b/ProjectContainerShip/ProjectContainerShip/MovementStrategy/AbstractStrategy.cs
@@ -0,0 +1,141 @@
+using ProjectContainerShip.Drawnings;
+using ProjectContainerShip.MovementStrategy;
+
+
+namespace ProjectContainerShip.MovementStrategy;
+
+///
+/// Класс-стратегия перемещения объекта
+///
+public abstract class AbstractStrategy
+{
+ /// *
+ /// Перемещаемый объект
+ ///
+ private IMoveableObject? _moveableObject;
+
+ ///
+ /// Статус перемещения
+ ///
+ private StrategyStatus _state = StrategyStatus.NotInit;
+
+ ///
+ /// Ширина поля
+ ///
+ protected int FieldWidth { get; private set; }
+
+ ///
+ /// Высота поля
+ ///
+ protected int FieldHeight { get; private set; }
+
+ ///
+ /// Статус перемещения
+ ///
+ public StrategyStatus GetStatus() { return _state; }
+
+ ///
+ /// Установка данных
+ ///
+ /// Перемещаемый объект
+ /// Ширина поля
+ /// Высота поля
+ public void SetData(IMoveableObject moveableObject, int width, int height)
+ {
+ if (moveableObject == null)
+ {
+ _state = StrategyStatus.NotInit;
+ return;
+ }
+
+ _state = StrategyStatus.InProgress;
+ _moveableObject = moveableObject;
+ FieldWidth = width;
+ FieldHeight = height;
+ }
+
+ ///
+ /// Шаг перемещения
+ ///
+ public void MakeStep()
+ {
+ if (_state != StrategyStatus.InProgress)
+ {
+ return;
+ }
+ if (IsTargetDestinaion())
+ {
+ _state = StrategyStatus.Finish;
+ return;
+ }
+ MoveToTarget();
+ }
+
+ ///
+ /// Перемещение влево
+ ///
+ /// Результат перемещения (true - удалось переместиться, false - неудача)
+ protected bool MoveLeft() => MoveTo(MovementDirection.Left);
+
+ ///
+ /// Перемещение вправо
+ ///
+ /// Результат перемещения (true - удалось переместиться, false - неудача)
+ protected bool MoveRight() => MoveTo(MovementDirection.Right);
+
+ ///
+ /// Перемещение вверх
+ ///
+ /// Результат перемещения (true - удалось переместиться, false - неудача)
+ protected bool MoveUp() => MoveTo(MovementDirection.Up);
+
+ ///
+ /// Перемещение вниз
+ ///
+ /// Результат перемещения (true - удалось переместиться, false - неудача)
+ protected bool MoveDown() => MoveTo(MovementDirection.Down);
+
+ ///
+ /// Параметры объекта
+ ///
+ protected ObjectParameters? GetObjectParameters => _moveableObject?.GetObjectPosition;
+
+ ///
+ /// Шаг объекта
+ ///
+ ///
+ protected int? GetStep()
+ {
+ if (_state != StrategyStatus.InProgress)
+ {
+ return null;
+ }
+ return _moveableObject?.GetStep;
+ }
+
+ ///
+ /// Перемещение к цели
+ ///
+ protected abstract void MoveToTarget();
+
+ ///
+ /// Достигнута ли цель
+ ///
+ ///
+ protected abstract bool IsTargetDestinaion();
+
+ ///
+ /// Попытка перемещения в требуемом направлении
+ ///
+ /// Направление
+ /// Результат попытки (true - удалось переместиться, false - неудача)
+ private bool MoveTo(MovementDirection movementDirection)
+ {
+ if (_state != StrategyStatus.InProgress)
+ {
+ return false;
+ }
+
+ return _moveableObject?.TryMoveObject(movementDirection) ?? false;
+ }
+}
diff --git a/ProjectContainerShip/ProjectContainerShip/MovementStrategy/IMoveableObjects.cs b/ProjectContainerShip/ProjectContainerShip/MovementStrategy/IMoveableObjects.cs
new file mode 100644
index 0000000..f736a64
--- /dev/null
+++ b/ProjectContainerShip/ProjectContainerShip/MovementStrategy/IMoveableObjects.cs
@@ -0,0 +1,28 @@
+using ProjectContainerShip.Drawnings;
+
+namespace ProjectContainerShip.MovementStrategy;
+
+///
+/// Интерфейс для работы с перемещаемым объектом
+///
+public interface IMoveableObject
+{
+
+ ///
+ /// Получение координаты X объекта
+ ///
+ ObjectParameters? GetObjectPosition { get; }
+
+ ///
+ /// Шаг объекта
+ ///
+ int GetStep { get; }
+
+ ///
+ /// Попытка переместить объект в указанном направлении
+ ///
+ /// Направление
+ /// true - объект перемещен, false - перемещение невозможно
+ bool TryMoveObject(MovementDirection direction);
+}
+
diff --git a/ProjectContainerShip/ProjectContainerShip/MovementStrategy/MoveToBorder.cs b/ProjectContainerShip/ProjectContainerShip/MovementStrategy/MoveToBorder.cs
new file mode 100644
index 0000000..bd83928
--- /dev/null
+++ b/ProjectContainerShip/ProjectContainerShip/MovementStrategy/MoveToBorder.cs
@@ -0,0 +1,47 @@
+namespace ProjectContainerShip.MovementStrategy;
+
+internal class MoveToBorder : AbstractStrategy
+{
+ protected override bool IsTargetDestinaion()
+ {
+
+ if (GetObjectParameters == null)
+ {
+ return false;
+ }
+ return GetObjectParameters.RightBorder <= FieldWidth &&
+ GetObjectParameters.RightBorder + GetStep() >= FieldWidth &&
+ GetObjectParameters.DownBorder <= FieldHeight &&
+ GetObjectParameters.DownBorder + GetStep() >= FieldHeight;
+ }
+ protected override void MoveToTarget()
+ {
+ if (GetObjectParameters == null)
+ {
+ return;
+ }
+ if (Math.Abs(GetObjectParameters.ObjectMiddleHorizontal - FieldWidth) > GetStep())
+ {
+ if (GetObjectParameters.ObjectMiddleHorizontal - FieldWidth > 0)
+ {
+ MoveLeft();
+ }
+ else
+ {
+ MoveRight();
+ }
+
+ }
+ if (Math.Abs(GetObjectParameters.ObjectMiddleVertical - FieldHeight) > GetStep())
+ {
+ if (GetObjectParameters.ObjectMiddleVertical - FieldHeight > 0)
+ {
+ MoveUp();
+ }
+ else
+ {
+ MoveDown();
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/ProjectContainerShip/ProjectContainerShip/MovementStrategy/MoveToCenter.cs b/ProjectContainerShip/ProjectContainerShip/MovementStrategy/MoveToCenter.cs
new file mode 100644
index 0000000..7f8214d
--- /dev/null
+++ b/ProjectContainerShip/ProjectContainerShip/MovementStrategy/MoveToCenter.cs
@@ -0,0 +1,51 @@
+namespace ProjectContainerShip.MovementStrategy
+{
+ public class MoveToCenter : AbstractStrategy
+ {
+ protected override bool IsTargetDestinaion()
+ {
+ ObjectParameters? objParams = GetObjectParameters;
+ if (objParams == null)
+ {
+ return false;
+ }
+ return objParams.ObjectMiddleHorizontal <= FieldWidth / 2 &&
+ objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
+ objParams.ObjectMiddleVertical <= FieldHeight / 2 &&
+ objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
+ }
+ protected override void MoveToTarget()
+ {
+ ObjectParameters? objParams = GetObjectParameters;
+ if (objParams == null)
+ {
+ return;
+ }
+ int diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
+ if (Math.Abs(diffX) > GetStep())
+ {
+ if (diffX > 0)
+ {
+ MoveLeft();
+ }
+ else
+ {
+ MoveRight();
+ }
+
+ }
+ int diffY = objParams.ObjectMiddleVertical - FieldHeight / 2;
+ if (Math.Abs(diffY) > GetStep())
+ {
+ if (diffY > 0)
+ {
+ MoveUp();
+ }
+ else
+ {
+ MoveDown();
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/ProjectContainerShip/ProjectContainerShip/MovementStrategy/MoveableShip.cs b/ProjectContainerShip/ProjectContainerShip/MovementStrategy/MoveableShip.cs
new file mode 100644
index 0000000..63d3e8a
--- /dev/null
+++ b/ProjectContainerShip/ProjectContainerShip/MovementStrategy/MoveableShip.cs
@@ -0,0 +1,67 @@
+using ProjectContainerShip.Drawnings;
+
+namespace ProjectContainerShip.MovementStrategy;
+
+///
+/// Класс-реализация IMoveableObject с использованием DrawningShip
+///
+public class MoveableShip : IMoveableObject
+{
+ ///
+ /// Поле-объект класса DrawningShip или его наследника
+ ///
+ private readonly DrawningShip? _ship = null;
+
+ ///
+ /// Конструктор
+ ///
+ ///
+ public MoveableShip(DrawningShip ship)
+ {
+ _ship = ship;
+ }
+
+ public ObjectParameters? GetObjectPosition
+ {
+ get
+ {
+ if (_ship == null || _ship.EntityShip == null || !_ship.GetPosX.HasValue || !_ship.GetPosY.HasValue)
+ {
+ return null;
+ }
+
+ return new ObjectParameters(_ship.GetPosX.Value, _ship.GetPosY.Value, _ship.GetWidth, _ship.GetHeight);
+ }
+ }
+
+ public int GetStep => (int)(_ship?.EntityShip?.Step ?? 0);
+
+ public bool TryMoveObject(MovementDirection direction)
+ {
+ if (_ship == null || _ship.EntityShip == null)
+ {
+ return false;
+ }
+
+ return _ship.MoveTransport(GetDirectionType(direction));
+ }
+
+ ///
+ /// Конвертация из MovementDirection в DirectionType
+ ///
+ /// MovementDirection
+ /// DirectionType
+ private static DirectionType GetDirectionType(MovementDirection direction)
+ {
+ return direction switch
+ {
+ MovementDirection.Left => DirectionType.Left,
+ MovementDirection.Right => DirectionType.Right,
+ MovementDirection.Up => DirectionType.Up,
+ MovementDirection.Down => DirectionType.Down,
+ _ => DirectionType.Unknow,
+ };
+ }
+
+
+}
\ No newline at end of file
diff --git a/ProjectContainerShip/ProjectContainerShip/DirectionType.cs b/ProjectContainerShip/ProjectContainerShip/MovementStrategy/MovementDirection.cs
similarity index 81%
rename from ProjectContainerShip/ProjectContainerShip/DirectionType.cs
rename to ProjectContainerShip/ProjectContainerShip/MovementStrategy/MovementDirection.cs
index 4914166..9fe86a8 100644
--- a/ProjectContainerShip/ProjectContainerShip/DirectionType.cs
+++ b/ProjectContainerShip/ProjectContainerShip/MovementStrategy/MovementDirection.cs
@@ -1,9 +1,9 @@
-namespace ProjectContainerShip;
+namespace ProjectContainerShip.MovementStrategy;
///
/// Направление перемещения
///
-public enum DirectionType
+public enum MovementDirection
{
///
/// Вверх
@@ -24,4 +24,4 @@ public enum DirectionType
/// Вправо
///
Right = 4
-}
\ No newline at end of file
+}
diff --git a/ProjectContainerShip/ProjectContainerShip/MovementStrategy/ObjectParameters.cs b/ProjectContainerShip/ProjectContainerShip/MovementStrategy/ObjectParameters.cs
new file mode 100644
index 0000000..144354f
--- /dev/null
+++ b/ProjectContainerShip/ProjectContainerShip/MovementStrategy/ObjectParameters.cs
@@ -0,0 +1,53 @@
+namespace ProjectContainerShip.MovementStrategy;
+
+public class ObjectParameters
+{
+ private readonly int _x;
+ private readonly int _y;
+ private readonly int _width;
+ private readonly int _height;
+ ///
+ /// Левая граница
+ ///
+ public int LeftBorder => _x;
+
+ ///
+ /// Верхняя граница
+ ///
+ public int TopBorder => _y;
+
+ ///
+ /// Правая граница
+ ///
+ public int RightBorder => _x + _width;
+
+ ///
+ /// Нижняя граница
+ ///
+ public int DownBorder => _y + _height;
+
+ ///
+ /// Середина объекта
+ ///
+ public int ObjectMiddleHorizontal => _x + _width / 2;
+
+ ///
+ /// Середина объекта
+ ///
+ public int ObjectMiddleVertical => _y + _height / 2;
+
+ ///
+ /// Конструктор
+ ///
+ /// Координата X
+ /// Координата Y
+ /// Ширина
+ /// Высота
+ public ObjectParameters(int x, int y, int width, int height)
+ {
+ _x = x;
+ _y = y;
+ _width = width;
+ _height = height;
+ }
+}
diff --git a/ProjectContainerShip/ProjectContainerShip/MovementStrategy/StrategyStatus.cs b/ProjectContainerShip/ProjectContainerShip/MovementStrategy/StrategyStatus.cs
new file mode 100644
index 0000000..57ea461
--- /dev/null
+++ b/ProjectContainerShip/ProjectContainerShip/MovementStrategy/StrategyStatus.cs
@@ -0,0 +1,20 @@
+namespace ProjectContainerShip.MovementStrategy;
+
+public enum StrategyStatus
+{
+ ///