From b179213a1f61b41aca8b7ff5151b9cf37c08b01d Mon Sep 17 00:00:00 2001
From: artur-kalimullin <144933634+artur-kalimullin@users.noreply.github.com>
Date: Sat, 9 Mar 2024 20:13:54 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=5F2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ProjectAirFighter/DrawningAirFighter.cs | 341 ------------------
.../Drawnings/DirectionType.cs | 32 ++
.../Drawnings/DrawningAirCraft.cs | 297 +++++++++++++++
.../Drawnings/DrawningAirFighter.cs | 113 ++++++
.../Entities/EntityAirCraft.cs | 39 ++
.../{ => Entities}/EntityAirFighter.cs | 30 +-
.../FormAirFighter.Designer.cs | 44 ++-
.../ProjectAirFighter/FormAirFighter.cs | 117 ++++--
.../MovementStrategy/AbstractStrategy.cs | 139 +++++++
.../MovementStrategy/IMoveableObjectcs.cs | 26 ++
.../MovementStrategy/MoveToBorder.cs | 53 +++
.../MovementStrategy/MoveToCenter.cs | 53 +++
.../MovementStrategy/MoveableAirCraft.cs | 63 ++++
.../MovementDirection.cs} | 7 +-
.../MovementStrategy/ObjectParameters.cs | 71 ++++
.../MovementStrategy/StrategyStatus.cs | 22 ++
16 files changed, 1052 insertions(+), 395 deletions(-)
delete mode 100644 ProjectAirFighter/ProjectAirFighter/DrawningAirFighter.cs
create mode 100644 ProjectAirFighter/ProjectAirFighter/Drawnings/DirectionType.cs
create mode 100644 ProjectAirFighter/ProjectAirFighter/Drawnings/DrawningAirCraft.cs
create mode 100644 ProjectAirFighter/ProjectAirFighter/Drawnings/DrawningAirFighter.cs
create mode 100644 ProjectAirFighter/ProjectAirFighter/Entities/EntityAirCraft.cs
rename ProjectAirFighter/ProjectAirFighter/{ => Entities}/EntityAirFighter.cs (63%)
create mode 100644 ProjectAirFighter/ProjectAirFighter/MovementStrategy/AbstractStrategy.cs
create mode 100644 ProjectAirFighter/ProjectAirFighter/MovementStrategy/IMoveableObjectcs.cs
create mode 100644 ProjectAirFighter/ProjectAirFighter/MovementStrategy/MoveToBorder.cs
create mode 100644 ProjectAirFighter/ProjectAirFighter/MovementStrategy/MoveToCenter.cs
create mode 100644 ProjectAirFighter/ProjectAirFighter/MovementStrategy/MoveableAirCraft.cs
rename ProjectAirFighter/ProjectAirFighter/{DirectionType.cs => MovementStrategy/MovementDirection.cs} (81%)
create mode 100644 ProjectAirFighter/ProjectAirFighter/MovementStrategy/ObjectParameters.cs
create mode 100644 ProjectAirFighter/ProjectAirFighter/MovementStrategy/StrategyStatus.cs
diff --git a/ProjectAirFighter/ProjectAirFighter/DrawningAirFighter.cs b/ProjectAirFighter/ProjectAirFighter/DrawningAirFighter.cs
deleted file mode 100644
index 2c2e742..0000000
--- a/ProjectAirFighter/ProjectAirFighter/DrawningAirFighter.cs
+++ /dev/null
@@ -1,341 +0,0 @@
-namespace ProjectAirFighter;
-
-///
-/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
-///
-public class DrawningAirFighter
-{
- ///
- /// Класс-сущность
- ///
- public EntityAirFighter? EntityAirFighter { get; private set; }
-
- ///
- /// Ширина окна
- ///
- private int? _pictureWidth;
-
- ///
- /// Высота окна
- ///
- private int? _pictureHeight;
-
- ///
- /// Левая координата прорисовки истребителя
- ///
- private int? _startPosX;
-
- ///
- /// Верхняя кооридната прорисовки истребителя
- ///
- private int? _startPosY;
-
- ///
- /// Ширина прорисовки истребителя
- ///
- private readonly int _drawningAirFighterWidth = 76;
-
- ///
- /// Высота прорисовки истребителя
- ///
- private readonly int _drawningAirFighterHeight = 80;
-
- ///
- /// Инициализация свойств
- ///
- /// Скорость
- /// Вес
- /// Основной цвет
- /// Дополнительный цвет
- /// Признак наличия ПГО
- /// Признак наличия ракет
- public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool pgo, bool rockets)
- {
- EntityAirFighter = new EntityAirFighter();
- EntityAirFighter.Init(speed, weight, bodyColor, additionalColor, pgo, rockets);
- _pictureWidth = null;
- _pictureHeight = null;
- _startPosX = null;
- _startPosY = null;
- }
-
- ///
- /// Установка границ поля
- ///
- /// Ширина поля
- /// Высота поля
- /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах
- public bool SetPictureSize(int width, int height)
- {
-
- if (_drawningAirFighterWidth > width || _drawningAirFighterHeight > height)
- {
- return false;
- }
-
- _pictureWidth = width;
- _pictureHeight = height;
-
- if (_startPosX.HasValue && _startPosY.HasValue)
- {
- SetPosition(_startPosX.Value, _startPosY.Value);
- }
-
- return true;
- }
-
- ///
- /// Установка позиции
- ///
- /// Координата X
- /// Координата Y
- ///
- public void SetPosition(int x, int y)
- {
- if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
- {
-
- return;
- }
-
- if (x < 0)
- {
- x = 0;
- }
- else if (x > _pictureWidth - _drawningAirFighterWidth)
- {
- x = _pictureWidth.Value - _drawningAirFighterWidth;
- }
-
- if (y < 0)
- {
- y = 0;
- }
- else if (y > _pictureHeight - _drawningAirFighterHeight)
- {
- y = _pictureHeight.Value - _drawningAirFighterHeight;
- }
-
- _startPosX = x;
- _startPosY = y;
- }
-
- ///
- /// Изменение направления перемещения
- ///
- /// Направление
- /// true - перемещене выполнено, false - перемещение невозможно
- public bool MoveTransport(DirectionType direction)
- {
- if (EntityAirFighter == null || !_startPosX.HasValue || !_startPosY.HasValue)
- {
- return false;
- }
-
- switch (direction)
- {
- //влево
- case DirectionType.Left:
- if (_startPosX.Value - EntityAirFighter.Step > 0)
- {
- _startPosX -= (int)EntityAirFighter.Step;
- }
- return true;
- //вверх
- case DirectionType.Up:
- if (_startPosY.Value - EntityAirFighter.Step > 0)
- {
- _startPosY -= (int)EntityAirFighter.Step;
- }
- return true;
- // вправо
- case DirectionType.Right:
- if (_startPosX.Value + EntityAirFighter.Step < _pictureWidth - _drawningAirFighterWidth)
- {
- _startPosX += (int)EntityAirFighter.Step;
- }
- return true;
- //вниз
- case DirectionType.Down:
- if (_startPosY.Value + EntityAirFighter.Step < _pictureHeight - _drawningAirFighterHeight)
- {
- _startPosY += (int)EntityAirFighter.Step;
- }
- return true;
- default:
- return false;
- }
- }
- ///
- /// Прорисовка объекта
- ///
- ///
- public void DrawTransport(Graphics g)
- {
- if (EntityAirFighter == null || !_startPosX.HasValue || !_startPosY.HasValue)
- {
- return;
- }
- Pen pen = new(Color.Black);
- Brush additionalBrush = new SolidBrush(EntityAirFighter.AdditionalColor);
-
- //ПГО
- if (EntityAirFighter.Pgo)
- {
- Point[] pgo1 = new Point[] {
- new Point { X = _startPosX.Value + 50, Y = _startPosY.Value + 25},
- new Point { X = _startPosX.Value + 50, Y = _startPosY.Value + 15},
- new Point { X = _startPosX.Value + 55, Y = _startPosY.Value + 25}
- };
-
- g.DrawPolygon(pen, pgo1);
- g.FillPolygon(additionalBrush, pgo1);
-
- Point[] pgo2 = new Point[] {
- new Point { X = _startPosX.Value + 50, Y = _startPosY.Value + 49},
- new Point { X = _startPosX.Value + 50, Y = _startPosY.Value + 59},
- new Point { X = _startPosX.Value + 55, Y = _startPosY.Value + 49}
- };
-
- g.DrawPolygon(pen, pgo2);
- g.FillPolygon(additionalBrush, pgo2);
- }
-
- //фюзеляж
- Brush br = new SolidBrush(EntityAirFighter.BodyColor);
-
- g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 25, 50, 24);
- g.FillRectangle(br, _startPosX.Value + 10, _startPosY.Value + 25, 50, 24);
-
- Point[] nose = new Point[] {
- new Point { X = _startPosX.Value + 60, Y = _startPosY.Value + 25},
- new Point { X = _startPosX.Value + 76, Y = _startPosY.Value + 37},
- new Point { X = _startPosX.Value + 60, Y = _startPosY.Value + 49}
- };
-
- g.DrawPolygon(pen, nose);
- Brush brgray = new SolidBrush(Color.Gray);
- g.FillPolygon(brgray, nose);
-
- //левое крыло
- Point[] wingl = new Point[] {
- new Point { X = _startPosX.Value + 45, Y = _startPosY.Value + 25},
- new Point { X = _startPosX.Value + 45, Y = _startPosY.Value},
- new Point { X = _startPosX.Value + 37, Y = _startPosY.Value},
- new Point { X = _startPosX.Value + 30, Y = _startPosY.Value + 25}
- };
-
- g.DrawPolygon(pen, wingl);
- g.FillPolygon(br, wingl);
-
- //правое крыло
- Point[] wingr = new Point[] {
- new Point { X = _startPosX.Value + 45, Y = _startPosY.Value + 49},
- new Point { X = _startPosX.Value + 45, Y = _startPosY.Value + 74},
- new Point { X = _startPosX.Value + 37, Y = _startPosY.Value + 74},
- new Point { X = _startPosX.Value + 30, Y = _startPosY.Value + 49}
- };
-
- g.DrawPolygon(pen, wingr);
- g.FillPolygon(br, wingr);
-
- //левый хвост
- Point[] ltail = new Point[] {
- new Point { X = _startPosX.Value + 10, Y = _startPosY.Value + 49},
- new Point { X = _startPosX.Value + 10, Y = _startPosY.Value + 66},
- new Point { X = _startPosX.Value + 20, Y = _startPosY.Value + 57},
- new Point { X = _startPosX.Value + 20, Y = _startPosY.Value + 49}
- };
-
- g.DrawPolygon(pen, ltail);
- g.FillPolygon(br, ltail);
-
- //правый хвост
- Point[] rtail = new Point[] {
- new Point { X = _startPosX.Value + 10, Y = _startPosY.Value + 25},
- new Point { X = _startPosX.Value + 10, Y = _startPosY.Value + 8},
- new Point { X = _startPosX.Value + 20, Y = _startPosY.Value + 17},
- new Point { X = _startPosX.Value + 20, Y = _startPosY.Value + 25}
- };
-
- g.DrawPolygon(pen, rtail);
- g.FillPolygon(br, rtail);
-
- // ракеты
- if (EntityAirFighter.Rockets)
- {
- Point[] rocket1 = new Point[] {
- new Point { X = _startPosX.Value + 50, Y = _startPosY.Value + 71},
- new Point { X = _startPosX.Value + 50, Y = _startPosY.Value + 74},
- new Point { X = _startPosX.Value + 55, Y = _startPosY.Value + 69},
- new Point { X = _startPosX.Value + 50, Y = _startPosY.Value + 64}
- };
-
- g.DrawPolygon(pen, rocket1);
- g.FillPolygon(additionalBrush, rocket1);
-
- g.DrawRectangle(pen, _startPosX.Value + 45, _startPosY.Value + 67, 5, 4);
- g.FillRectangle(additionalBrush, _startPosX.Value + 45, _startPosY.Value + 67, 5, 4);
-
- Point[] rocket2 = new Point[] {
- new Point { X = _startPosX.Value + 50, Y = _startPosY.Value +7},
- new Point { X = _startPosX.Value + 50, Y = _startPosY.Value + 10},
- new Point { X = _startPosX.Value + 55, Y = _startPosY.Value + 5},
- new Point { X = _startPosX.Value + 50, Y = _startPosY.Value}
- };
-
- g.DrawPolygon(pen, rocket2);
- g.FillPolygon(additionalBrush, rocket2);
-
- g.DrawRectangle(pen, _startPosX.Value + 45, _startPosY.Value + 3, 5, 4);
- g.FillRectangle(additionalBrush, _startPosX.Value + 45, _startPosY.Value + 3, 5, 4);
- }
-
- //обводка
- g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 25, 50, 24);
- g.DrawLine(pen, _startPosX.Value + 60, _startPosY.Value + 25, _startPosX.Value + 76, _startPosY.Value + 37);
- g.DrawLine(pen, _startPosX.Value + 76, _startPosY.Value + 37, _startPosX.Value + 60, _startPosY.Value + 49);
-
- g.DrawLine(pen, _startPosX.Value + 45, _startPosY.Value + 25, _startPosX.Value + 45, _startPosY.Value);
- g.DrawLine(pen, _startPosX.Value + 45, _startPosY.Value, _startPosX.Value + 37, _startPosY.Value);
- g.DrawLine(pen, _startPosX.Value + 37, _startPosY.Value, _startPosX.Value + 30, _startPosY.Value + 25);
-
- g.DrawLine(pen, _startPosX.Value + 45, _startPosY.Value + 49, _startPosX.Value + 45, _startPosY.Value + 74);
- g.DrawLine(pen, _startPosX.Value + 45, _startPosY.Value + 74, _startPosX.Value + 37, _startPosY.Value + 74);
- g.DrawLine(pen, _startPosX.Value + 37, _startPosY.Value + 74, _startPosX.Value + 30, _startPosY.Value + 49);
-
- g.DrawLine(pen, _startPosX.Value + 10, _startPosY.Value + 49, _startPosX.Value + 10, _startPosY.Value + 66);
- g.DrawLine(pen, _startPosX.Value + 10, _startPosY.Value + 66, _startPosX.Value + 20, _startPosY.Value + 57);
- g.DrawLine(pen, _startPosX.Value + 20, _startPosY.Value + 57, _startPosX.Value + 20, _startPosY.Value + 49);
-
- g.DrawLine(pen, _startPosX.Value + 10, _startPosY.Value + 25, _startPosX.Value + 10, _startPosY.Value + 8);
- g.DrawLine(pen, _startPosX.Value + 10, _startPosY.Value + 8, _startPosX.Value + 20, _startPosY.Value + 17);
- g.DrawLine(pen, _startPosX.Value + 20, _startPosY.Value + 17, _startPosX.Value + 20, _startPosY.Value + 25);
-
- if (EntityAirFighter.Rockets)
- {
- g.DrawRectangle(pen, _startPosX.Value + 45, _startPosY.Value + 67, 5, 4);
- g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 71, _startPosX.Value + 50, _startPosY.Value + 74);
- g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 74, _startPosX.Value + 55, _startPosY.Value + 69);
- g.DrawLine(pen, _startPosX.Value + 55, _startPosY.Value + 69, _startPosX.Value + 50, _startPosY.Value + 64);
- g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 64, _startPosX.Value + 50, _startPosY.Value + 71);
-
-
- g.DrawRectangle(pen, _startPosX.Value + 45, _startPosY.Value + 3, 5, 4);
- g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 7, _startPosX.Value + 50, _startPosY.Value + 10);
- g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 10, _startPosX.Value + 55, _startPosY.Value + 5);
- g.DrawLine(pen, _startPosX.Value + 55, _startPosY.Value + 5, _startPosX.Value + 50, _startPosY.Value);
- g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value, _startPosX.Value + 50, _startPosY.Value + 7);
- }
-
- if (EntityAirFighter.Pgo)
- {
- g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 25, _startPosX.Value + 50, _startPosY.Value + 15);
- g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 15, _startPosX.Value + 55, _startPosY.Value + 25);
-
- g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 49, _startPosX.Value + 50, _startPosY.Value + 59);
- g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 59, _startPosX.Value + 55, _startPosY.Value + 49);
- }
-
- }
-}
\ No newline at end of file
diff --git a/ProjectAirFighter/ProjectAirFighter/Drawnings/DirectionType.cs b/ProjectAirFighter/ProjectAirFighter/Drawnings/DirectionType.cs
new file mode 100644
index 0000000..13f889c
--- /dev/null
+++ b/ProjectAirFighter/ProjectAirFighter/Drawnings/DirectionType.cs
@@ -0,0 +1,32 @@
+namespace ProjectAirFighter.Drawnings;
+
+///
+/// Направление перемещения
+///
+public enum DirectionType
+{
+ ///
+ /// Неизвестное направление
+ ///
+ Unknow = -1,
+
+ ///
+ /// Вверх
+ ///
+ Up = 1,
+
+ ///
+ /// Вниз
+ ///
+ Down = 2,
+
+ ///
+ /// Влево
+ ///
+ Left = 3,
+
+ ///
+ /// Вправо
+ ///
+ Right = 4
+}
\ No newline at end of file
diff --git a/ProjectAirFighter/ProjectAirFighter/Drawnings/DrawningAirCraft.cs b/ProjectAirFighter/ProjectAirFighter/Drawnings/DrawningAirCraft.cs
new file mode 100644
index 0000000..513e00c
--- /dev/null
+++ b/ProjectAirFighter/ProjectAirFighter/Drawnings/DrawningAirCraft.cs
@@ -0,0 +1,297 @@
+using ProjectAirFighter.Entities;
+
+namespace ProjectAirFighter.Drawnings;
+///
+/// Класс, отвечающий за прорисовку и перемещение базового объекта-сущности
+///
+public class DrawningAirCraft
+{
+ ///
+ /// Класс-сущность
+ ///
+ public EntityAirCraft? EntityAirCraft { get; protected set; }
+
+ ///
+ /// Ширина окна
+ ///
+ private int? _pictureWidth;
+
+ ///
+ /// Высота окна
+ ///
+ private int? _pictureHeight;
+
+ ///
+ /// Левая координата прорисовки самолёта
+ ///
+ protected int? _startPosX;
+
+ ///
+ /// Верхняя кооридната прорисовки самолёта
+ ///
+ protected int? _startPosY;
+
+ ///
+ /// Ширина прорисовки самолёта
+ ///
+ private readonly int _drawningAirFighterWidth = 66;
+
+ ///
+ /// Высота прорисовки самолёта
+ ///
+ private readonly int _drawningAirFighterHeight = 74;
+
+ ///
+ /// Координата X объекта
+ ///
+ public int? GetPosX => _startPosX;
+
+ ///
+ /// Координата Y объекта
+ ///
+ public int? GetPosY => _startPosY;
+
+ ///
+ /// Ширина объекта
+ ///
+ public int GetWidth => _drawningAirFighterWidth;
+
+ ///
+ /// Высота объекта
+ ///
+ public int GetHeight => _drawningAirFighterHeight;
+ ///
+ /// Пустой конструктор
+ ///
+ private DrawningAirCraft()
+ {
+ _pictureWidth = null;
+ _pictureHeight = null;
+ _startPosX = null;
+ _startPosY = null;
+ }
+
+ ///
+ /// Конструктор
+ ///
+ /// Скорость
+ /// Вес
+ /// Основной цвет
+ public DrawningAirCraft(int speed, double weight, Color bodyColor) : this()
+ {
+ EntityAirCraft = new EntityAirCraft(speed, weight, bodyColor);
+
+ }
+
+ ///
+ /// Конструктор для наследников
+ ///
+ /// Ширина прорисовки самолёта
+ /// Высота прорисовки самолёта
+ protected DrawningAirCraft(int drawningAirFighterWidth, int drawningAirFighterHeight) : this()
+ {
+ _drawningAirFighterWidth = drawningAirFighterWidth;
+ _drawningAirFighterHeight = drawningAirFighterHeight;
+ }
+
+ ///
+ /// Установка границ поля
+ ///
+ /// Ширина поля
+ /// Высота поля
+ /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах
+ public bool SetPictureSize(int width, int height)
+ {
+
+ if (_drawningAirFighterWidth > width || _drawningAirFighterHeight > height)
+ {
+ return false;
+ }
+
+ _pictureWidth = width;
+ _pictureHeight = height;
+
+ if (_startPosX.HasValue && _startPosY.HasValue)
+ {
+ SetPosition(_startPosX.Value, _startPosY.Value);
+ }
+
+ return true;
+ }
+
+ ///
+ /// Установка позиции
+ ///
+ /// Координата X
+ /// Координата Y
+ ///
+ public void SetPosition(int x, int y)
+ {
+ if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
+ {
+
+ return;
+ }
+
+ if (x < 0)
+ {
+ x = 0;
+ }
+ else if (x > _pictureWidth - _drawningAirFighterWidth)
+ {
+ x = _pictureWidth.Value - _drawningAirFighterWidth;
+ }
+
+ if (y < 0)
+ {
+ y = 0;
+ }
+ else if (y > _pictureHeight - _drawningAirFighterHeight)
+ {
+ y = _pictureHeight.Value - _drawningAirFighterHeight;
+ }
+
+ _startPosX = x;
+ _startPosY = y;
+ }
+
+ ///
+ /// Изменение направления перемещения
+ ///
+ /// Направление
+ /// true - перемещене выполнено, false - перемещение невозможно
+ public bool MoveTransport(DirectionType direction)
+ {
+ if (EntityAirCraft == null || !_startPosX.HasValue || !_startPosY.HasValue)
+ {
+ return false;
+ }
+
+ switch (direction)
+ {
+ //влево
+ case DirectionType.Left:
+ if (_startPosX.Value - EntityAirCraft.Step > 0)
+ {
+ _startPosX -= (int)EntityAirCraft.Step;
+ }
+ return true;
+ //вверх
+ case DirectionType.Up:
+ if (_startPosY.Value - EntityAirCraft.Step > 0)
+ {
+ _startPosY -= (int)EntityAirCraft.Step;
+ }
+ return true;
+ // вправо
+ case DirectionType.Right:
+ if (_startPosX.Value + EntityAirCraft.Step < _pictureWidth - _drawningAirFighterWidth)
+ {
+ _startPosX += (int)EntityAirCraft.Step;
+ }
+ return true;
+ //вниз
+ case DirectionType.Down:
+ if (_startPosY.Value + EntityAirCraft.Step < _pictureHeight - _drawningAirFighterHeight)
+ {
+ _startPosY += (int)EntityAirCraft.Step;
+ }
+ return true;
+ default:
+ return false;
+ }
+ }
+ ///
+ /// Прорисовка объекта
+ ///
+ ///
+ public virtual void DrawTransport(Graphics g)
+ {
+ if (EntityAirCraft == null || !_startPosX.HasValue || !_startPosY.HasValue)
+ {
+ return;
+ }
+ Pen pen = new(Color.Black);
+
+ //фюзеляж
+ Brush br = new SolidBrush(EntityAirCraft.BodyColor);
+
+ g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 25, 50, 24);
+ g.FillRectangle(br, _startPosX.Value, _startPosY.Value + 25, 50, 24);
+
+ Point[] nose = new Point[] {
+ new Point { X = _startPosX.Value + 50, Y = _startPosY.Value + 25},
+ new Point { X = _startPosX.Value + 66, Y = _startPosY.Value + 37},
+ new Point { X = _startPosX.Value + 50, Y = _startPosY.Value + 49}
+ };
+
+ g.DrawPolygon(pen, nose);
+ Brush brgray = new SolidBrush(Color.Gray);
+ g.FillPolygon(brgray, nose);
+
+ //левое крыло
+ Point[] wingl = new Point[] {
+ new Point { X = _startPosX.Value + 35, Y = _startPosY.Value + 25},
+ new Point { X = _startPosX.Value + 35, Y = _startPosY.Value},
+ new Point { X = _startPosX.Value + 27, Y = _startPosY.Value},
+ new Point { X = _startPosX.Value + 20, Y = _startPosY.Value + 25}
+ };
+
+ g.DrawPolygon(pen, wingl);
+ g.FillPolygon(br, wingl);
+
+ //правое крыло
+ Point[] wingr = new Point[] {
+ new Point { X = _startPosX.Value + 35, Y = _startPosY.Value + 49},
+ new Point { X = _startPosX.Value + 35, Y = _startPosY.Value + 74},
+ new Point { X = _startPosX.Value + 27, Y = _startPosY.Value + 74},
+ new Point { X = _startPosX.Value + 20, Y = _startPosY.Value + 49}
+ };
+
+ g.DrawPolygon(pen, wingr);
+ g.FillPolygon(br, wingr);
+
+ //левый хвост
+ Point[] ltail = new Point[] {
+ new Point { X = _startPosX.Value, Y = _startPosY.Value + 49},
+ new Point { X = _startPosX.Value, Y = _startPosY.Value + 66},
+ new Point { X = _startPosX.Value + 10, Y = _startPosY.Value + 57},
+ new Point { X = _startPosX.Value + 10, Y = _startPosY.Value + 49}
+ };
+
+ g.DrawPolygon(pen, ltail);
+ g.FillPolygon(br, ltail);
+
+ //правый хвост
+ Point[] rtail = new Point[] {
+ new Point { X = _startPosX.Value, Y = _startPosY.Value + 25},
+ new Point { X = _startPosX.Value, Y = _startPosY.Value + 8},
+ new Point { X = _startPosX.Value + 10, Y = _startPosY.Value + 17},
+ new Point { X = _startPosX.Value + 10, Y = _startPosY.Value + 25}
+ };
+
+ g.DrawPolygon(pen, rtail);
+ g.FillPolygon(br, rtail);
+
+ //обводка
+ g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 25, 50, 24);
+ g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 25, _startPosX.Value + 66, _startPosY.Value + 37);
+ g.DrawLine(pen, _startPosX.Value + 66, _startPosY.Value + 37, _startPosX.Value + 50, _startPosY.Value + 49);
+
+ g.DrawLine(pen, _startPosX.Value + 35, _startPosY.Value + 25, _startPosX.Value + 35, _startPosY.Value);
+ g.DrawLine(pen, _startPosX.Value + 35, _startPosY.Value, _startPosX.Value + 27, _startPosY.Value);
+ g.DrawLine(pen, _startPosX.Value + 27, _startPosY.Value, _startPosX.Value + 20, _startPosY.Value + 25);
+
+ g.DrawLine(pen, _startPosX.Value + 35, _startPosY.Value + 49, _startPosX.Value + 35, _startPosY.Value + 74);
+ g.DrawLine(pen, _startPosX.Value + 35, _startPosY.Value + 74, _startPosX.Value + 27, _startPosY.Value + 74);
+ g.DrawLine(pen, _startPosX.Value + 27, _startPosY.Value + 74, _startPosX.Value + 20, _startPosY.Value + 49);
+
+ g.DrawLine(pen, _startPosX.Value, _startPosY.Value + 49, _startPosX.Value, _startPosY.Value + 66);
+ g.DrawLine(pen, _startPosX.Value, _startPosY.Value + 66, _startPosX.Value + 10, _startPosY.Value + 57);
+ g.DrawLine(pen, _startPosX.Value + 10, _startPosY.Value + 57, _startPosX.Value + 10, _startPosY.Value + 49);
+
+ g.DrawLine(pen, _startPosX.Value, _startPosY.Value + 25, _startPosX.Value, _startPosY.Value + 8);
+ g.DrawLine(pen, _startPosX.Value, _startPosY.Value + 8, _startPosX.Value + 10, _startPosY.Value + 17);
+ g.DrawLine(pen, _startPosX.Value + 10, _startPosY.Value + 17, _startPosX.Value + 10, _startPosY.Value + 25);
+ }
+}
diff --git a/ProjectAirFighter/ProjectAirFighter/Drawnings/DrawningAirFighter.cs b/ProjectAirFighter/ProjectAirFighter/Drawnings/DrawningAirFighter.cs
new file mode 100644
index 0000000..745fcff
--- /dev/null
+++ b/ProjectAirFighter/ProjectAirFighter/Drawnings/DrawningAirFighter.cs
@@ -0,0 +1,113 @@
+using ProjectAirFighter.Entities;
+
+namespace ProjectAirFighter.Drawnings;
+
+///
+/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
+///
+public class DrawningAirFighter : DrawningAirCraft
+{
+ ///
+ /// Конструктор
+ ///
+ /// Скорость
+ /// Вес
+ /// Основной цвет
+ /// Дополнительный цвет
+ /// Признак наличия ПГО
+ /// Признак наличия ракет
+ public DrawningAirFighter(int speed, double weight, Color bodyColor, Color additionalColor, bool pgo, bool rockets) : base(76, 80)
+ {
+ EntityAirCraft = new EntityAirFighter(speed, weight, bodyColor, additionalColor, pgo, rockets);
+ }
+
+ public override void DrawTransport(Graphics g)
+ {
+ if (EntityAirCraft == null || EntityAirCraft is not EntityAirFighter airFighter || !_startPosX.HasValue || !_startPosY.HasValue)
+ {
+ return;
+ }
+
+ Pen pen = new(Color.Black);
+ Brush additionalBrush = new SolidBrush(airFighter.AdditionalColor);
+
+ //ПГО
+ if (airFighter.Pgo)
+ {
+ Point[] pgo1 = new Point[] {
+ new Point { X = _startPosX.Value + 40, Y = _startPosY.Value + 25},
+ new Point { X = _startPosX.Value + 40, Y = _startPosY.Value + 15},
+ new Point { X = _startPosX.Value + 45, Y = _startPosY.Value + 25}
+ };
+
+ g.DrawPolygon(pen, pgo1);
+ g.FillPolygon(additionalBrush, pgo1);
+
+ Point[] pgo2 = new Point[] {
+ new Point { X = _startPosX.Value + 40, Y = _startPosY.Value + 49},
+ new Point { X = _startPosX.Value + 40, Y = _startPosY.Value + 59},
+ new Point { X = _startPosX.Value + 45, Y = _startPosY.Value + 49}
+ };
+
+ g.DrawPolygon(pen, pgo2);
+ g.FillPolygon(additionalBrush, pgo2);
+ }
+ // ракеты
+ if (airFighter.Rockets)
+ {
+ Point[] rocket1 = new Point[] {
+ new Point { X = _startPosX.Value + 40, Y = _startPosY.Value + 71},
+ new Point { X = _startPosX.Value + 40, Y = _startPosY.Value + 74},
+ new Point { X = _startPosX.Value + 45, Y = _startPosY.Value + 69},
+ new Point { X = _startPosX.Value + 40, Y = _startPosY.Value + 64}
+ };
+
+ g.DrawPolygon(pen, rocket1);
+ g.FillPolygon(additionalBrush, rocket1);
+
+ g.DrawRectangle(pen, _startPosX.Value + 35, _startPosY.Value + 67, 5, 4);
+ g.FillRectangle(additionalBrush, _startPosX.Value + 35, _startPosY.Value + 67, 5, 4);
+
+ Point[] rocket2 = new Point[] {
+ new Point { X = _startPosX.Value + 40, Y = _startPosY.Value +7},
+ new Point { X = _startPosX.Value + 40, Y = _startPosY.Value + 10},
+ new Point { X = _startPosX.Value + 45, Y = _startPosY.Value + 5},
+ new Point { X = _startPosX.Value + 40, Y = _startPosY.Value}
+ };
+
+ g.DrawPolygon(pen, rocket2);
+ g.FillPolygon(additionalBrush, rocket2);
+
+ g.DrawRectangle(pen, _startPosX.Value + 35, _startPosY.Value + 3, 5, 4);
+ g.FillRectangle(additionalBrush, _startPosX.Value + 35, _startPosY.Value + 3, 5, 4);
+ }
+
+ //обводка
+ if (airFighter.Rockets)
+ {
+ g.DrawRectangle(pen, _startPosX.Value + 35, _startPosY.Value + 67, 5, 4);
+ g.DrawLine(pen, _startPosX.Value + 40, _startPosY.Value + 71, _startPosX.Value + 40, _startPosY.Value + 74);
+ g.DrawLine(pen, _startPosX.Value + 40, _startPosY.Value + 74, _startPosX.Value + 45, _startPosY.Value + 69);
+ g.DrawLine(pen, _startPosX.Value + 45, _startPosY.Value + 69, _startPosX.Value + 40, _startPosY.Value + 64);
+ g.DrawLine(pen, _startPosX.Value + 40, _startPosY.Value + 64, _startPosX.Value + 40, _startPosY.Value + 71);
+
+
+ g.DrawRectangle(pen, _startPosX.Value + 35, _startPosY.Value + 3, 5, 4);
+ g.DrawLine(pen, _startPosX.Value + 40, _startPosY.Value + 7, _startPosX.Value + 40, _startPosY.Value + 10);
+ g.DrawLine(pen, _startPosX.Value + 40, _startPosY.Value + 10, _startPosX.Value + 45, _startPosY.Value + 5);
+ g.DrawLine(pen, _startPosX.Value + 45, _startPosY.Value + 5, _startPosX.Value + 40, _startPosY.Value);
+ g.DrawLine(pen, _startPosX.Value + 40, _startPosY.Value, _startPosX.Value + 40, _startPosY.Value + 7);
+ }
+
+ if (airFighter.Pgo)
+ {
+ g.DrawLine(pen, _startPosX.Value + 40, _startPosY.Value + 25, _startPosX.Value + 40, _startPosY.Value + 15);
+ g.DrawLine(pen, _startPosX.Value + 40, _startPosY.Value + 15, _startPosX.Value + 45, _startPosY.Value + 25);
+
+ g.DrawLine(pen, _startPosX.Value + 40, _startPosY.Value + 49, _startPosX.Value + 40, _startPosY.Value + 59);
+ g.DrawLine(pen, _startPosX.Value + 40, _startPosY.Value + 59, _startPosX.Value + 45, _startPosY.Value + 49);
+ }
+
+ base.DrawTransport(g);
+ }
+}
\ No newline at end of file
diff --git a/ProjectAirFighter/ProjectAirFighter/Entities/EntityAirCraft.cs b/ProjectAirFighter/ProjectAirFighter/Entities/EntityAirCraft.cs
new file mode 100644
index 0000000..04ac9bc
--- /dev/null
+++ b/ProjectAirFighter/ProjectAirFighter/Entities/EntityAirCraft.cs
@@ -0,0 +1,39 @@
+namespace ProjectAirFighter.Entities;
+///
+/// Класс-сущность "Самолёт"
+///
+public class EntityAirCraft
+{
+ ///
+ /// Скорость
+ ///
+ public int Speed { get; private set; }
+
+ ///
+ /// Вес
+ ///
+ public double Weight { get; private set; }
+
+ ///
+ /// Основной цвет
+ ///
+ public Color BodyColor { get; private set; }
+
+ ///
+ /// Шаг перемещения истребителя
+ ///
+ public double Step => Speed * 100 / Weight;
+
+ ///
+ /// Конструктор сущности
+ ///
+ /// Скорость
+ /// Вес истребителя
+ /// Основной цвет
+ public EntityAirCraft(int speed, double weight, Color bodyColor)
+ {
+ Speed = speed;
+ Weight = weight;
+ BodyColor = bodyColor;
+ }
+}
diff --git a/ProjectAirFighter/ProjectAirFighter/EntityAirFighter.cs b/ProjectAirFighter/ProjectAirFighter/Entities/EntityAirFighter.cs
similarity index 63%
rename from ProjectAirFighter/ProjectAirFighter/EntityAirFighter.cs
rename to ProjectAirFighter/ProjectAirFighter/Entities/EntityAirFighter.cs
index f5c614e..4b42191 100644
--- a/ProjectAirFighter/ProjectAirFighter/EntityAirFighter.cs
+++ b/ProjectAirFighter/ProjectAirFighter/Entities/EntityAirFighter.cs
@@ -1,25 +1,10 @@
-namespace ProjectAirFighter;
+namespace ProjectAirFighter.Entities;
///
/// Класс-сущность "Истребитель"
///
-public class EntityAirFighter
+public class EntityAirFighter : EntityAirCraft
{
- ///
- /// Скорость
- ///
- public int Speed { get; private set; }
-
- ///
- /// Вес
- ///
- public double Weight { get; private set; }
-
- ///
- /// Основной цвет
- ///
- public Color BodyColor { get; private set; }
-
///
/// Дополнительный цвет (для опциональных элементов)
///
@@ -35,11 +20,6 @@ public class EntityAirFighter
///
public bool Rockets { get; private set; }
- ///
- /// Шаг перемещения истребителя
- ///
- public double Step => Speed * 100 / Weight;
-
///
/// Инициализация полей объекта-класса истребителя
///
@@ -49,13 +29,11 @@ public class EntityAirFighter
/// Дополнительный цвет
/// Признак наличия ПГО
/// Признак наличия ракет"
- public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool pgo , bool rockets)
+ public EntityAirFighter(int speed, double weight, Color bodyColor, Color additionalColor, bool pgo, bool rockets) : base(speed, weight, bodyColor)
{
- Speed = speed;
- Weight = weight;
- BodyColor = bodyColor;
AdditionalColor = additionalColor;
Pgo = pgo;
Rockets = rockets;
}
+
}
\ No newline at end of file
diff --git a/ProjectAirFighter/ProjectAirFighter/FormAirFighter.Designer.cs b/ProjectAirFighter/ProjectAirFighter/FormAirFighter.Designer.cs
index a7b6b81..92391be 100644
--- a/ProjectAirFighter/ProjectAirFighter/FormAirFighter.Designer.cs
+++ b/ProjectAirFighter/ProjectAirFighter/FormAirFighter.Designer.cs
@@ -34,6 +34,9 @@
buttonUp = new Button();
buttonRight = new Button();
buttonDown = new Button();
+ buttonСreateAirCraft = new Button();
+ comboBoxStrategy = new ComboBox();
+ buttonStrategyStep = new Button();
((System.ComponentModel.ISupportInitialize)pictureBoxAirFighter).BeginInit();
SuspendLayout();
//
@@ -51,9 +54,9 @@
buttonCreateAirFighter.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
buttonCreateAirFighter.Location = new Point(31, 470);
buttonCreateAirFighter.Name = "buttonCreateAirFighter";
- buttonCreateAirFighter.Size = new Size(94, 39);
+ buttonCreateAirFighter.Size = new Size(174, 39);
buttonCreateAirFighter.TabIndex = 1;
- buttonCreateAirFighter.Text = "Создать";
+ buttonCreateAirFighter.Text = "Создать истребить\r\n";
buttonCreateAirFighter.UseVisualStyleBackColor = true;
buttonCreateAirFighter.Click += ButtonCreateAirFighter_Click;
//
@@ -105,11 +108,45 @@
buttonDown.UseVisualStyleBackColor = true;
buttonDown.Click += ButtonMove_Click;
//
+ // buttonСreateAirCraft
+ //
+ buttonСreateAirCraft.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+ buttonСreateAirCraft.Location = new Point(242, 470);
+ buttonСreateAirCraft.Name = "buttonСreateAirCraft";
+ buttonСreateAirCraft.Size = new Size(174, 39);
+ buttonСreateAirCraft.TabIndex = 6;
+ buttonСreateAirCraft.Text = "Создать самолёт";
+ buttonСreateAirCraft.UseVisualStyleBackColor = true;
+ buttonСreateAirCraft.Click += buttonСreateAirCraft_Click;
+ //
+ // comboBoxStrategy
+ //
+ comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+ comboBoxStrategy.FormattingEnabled = true;
+ comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+ comboBoxStrategy.Location = new Point(637, 12);
+ comboBoxStrategy.Name = "comboBoxStrategy";
+ comboBoxStrategy.Size = new Size(151, 28);
+ comboBoxStrategy.TabIndex = 7;
+ //
+ // buttonStrategyStep
+ //
+ buttonStrategyStep.Location = new Point(694, 59);
+ buttonStrategyStep.Name = "buttonStrategyStep";
+ buttonStrategyStep.Size = new Size(94, 29);
+ buttonStrategyStep.TabIndex = 8;
+ buttonStrategyStep.Text = "Шаг";
+ buttonStrategyStep.UseVisualStyleBackColor = true;
+ buttonStrategyStep.Click += buttonStrategyStep_Click;
+ //
// FormAirFighter
//
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(800, 521);
+ Controls.Add(buttonStrategyStep);
+ Controls.Add(comboBoxStrategy);
+ Controls.Add(buttonСreateAirCraft);
Controls.Add(buttonDown);
Controls.Add(buttonRight);
Controls.Add(buttonUp);
@@ -131,5 +168,8 @@
private Button buttonUp;
private Button buttonRight;
private Button buttonDown;
+ private Button buttonСreateAirCraft;
+ private ComboBox comboBoxStrategy;
+ private Button buttonStrategyStep;
}
}
\ No newline at end of file
diff --git a/ProjectAirFighter/ProjectAirFighter/FormAirFighter.cs b/ProjectAirFighter/ProjectAirFighter/FormAirFighter.cs
index df8addd..233fa64 100644
--- a/ProjectAirFighter/ProjectAirFighter/FormAirFighter.cs
+++ b/ProjectAirFighter/ProjectAirFighter/FormAirFighter.cs
@@ -1,4 +1,7 @@
-namespace ProjectAirFighter;
+using ProjectAirFighter.Drawnings;
+using ProjectAirFighter.MovementStrategy;
+
+namespace ProjectAirFighter;
///
/// Форма работы с объектом "Истребитель"
@@ -8,7 +11,12 @@ public partial class FormAirFighter : Form
///
/// Поле-объект для прорисовки объекта
///
- private DrawningAirFighter? _drawningAirFighter;
+ private DrawningAirCraft? _drawningAirCraft;
+
+ ///
+ /// Стратегия перемещения
+ ///
+ private AbstractStrategy? _strategy;
///
/// Конструктор формы
@@ -16,6 +24,7 @@ public partial class FormAirFighter : Form
public FormAirFighter()
{
InitializeComponent();
+ _strategy = null;
}
///
@@ -23,34 +32,60 @@ public partial class FormAirFighter : Form
///
private void Draw()
{
- if (_drawningAirFighter == null)
+ if (_drawningAirCraft == null)
{
return;
}
Bitmap bmp = new(pictureBoxAirFighter.Width, pictureBoxAirFighter.Height);
Graphics gr = Graphics.FromImage(bmp);
- _drawningAirFighter.DrawTransport(gr);
+ _drawningAirCraft.DrawTransport(gr);
pictureBoxAirFighter.Image = bmp;
}
///
- /// Обработка нажатия кнопки "Создать"
+ /// Создание объекта класса-перемещения
+ ///
+ /// Тип создаваемого объекта
+ private void CreateObject(string type)
+ {
+ Random random = new();
+ switch (type)
+ {
+ case nameof(DrawningAirCraft):
+ _drawningAirCraft = new DrawningAirCraft(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(DrawningAirFighter):
+ _drawningAirCraft = new DrawningAirFighter(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;
+ }
+ _drawningAirCraft.SetPictureSize(pictureBoxAirFighter.Width, pictureBoxAirFighter.Height);
+ _drawningAirCraft.SetPosition(random.Next(10, 100), random.Next(10, 100));
+ _strategy = null;
+ comboBoxStrategy.Enabled = true;
+ Draw();
+ }
+
+ ///
+ /// Обработка нажатия кнопки "Создать истребитель"
///
///
///
- private void ButtonCreateAirFighter_Click(object sender, EventArgs e)
- {
- Random random = new();
- _drawningAirFighter = new DrawningAirFighter();
- _drawningAirFighter.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)));
- _drawningAirFighter.SetPictureSize(pictureBoxAirFighter.Width, pictureBoxAirFighter.Height);
- _drawningAirFighter.SetPosition(random.Next(10, 100), random.Next(10, 100));
- Draw();
- }
+ private void ButtonCreateAirFighter_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAirFighter));
+
+ ///
+ /// Обработка нажатия кнопки "Создать самолёт"
+ ///
+ ///
+ ///
+ private void buttonСreateAirCraft_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAirCraft));
+
///
/// Перемещение объекта по форме (нажатие кнопок навигации)
@@ -59,7 +94,7 @@ public partial class FormAirFighter : Form
///
private void ButtonMove_Click(object sender, EventArgs e)
{
- if (_drawningAirFighter == null)
+ if (_drawningAirCraft == null)
{
return;
}
@@ -69,16 +104,16 @@ public partial class FormAirFighter : Form
switch (name)
{
case "buttonUp":
- result = _drawningAirFighter.MoveTransport(DirectionType.Up);
+ result = _drawningAirCraft.MoveTransport(DirectionType.Up);
break;
case "buttonDown":
- result = _drawningAirFighter.MoveTransport(DirectionType.Down);
+ result = _drawningAirCraft.MoveTransport(DirectionType.Down);
break;
case "buttonLeft":
- result = _drawningAirFighter.MoveTransport(DirectionType.Left);
+ result = _drawningAirCraft.MoveTransport(DirectionType.Left);
break;
case "buttonRight":
- result = _drawningAirFighter.MoveTransport(DirectionType.Right);
+ result = _drawningAirCraft.MoveTransport(DirectionType.Right);
break;
}
@@ -87,4 +122,42 @@ public partial class FormAirFighter : Form
Draw();
}
}
+
+ private void buttonStrategyStep_Click(object sender, EventArgs e)
+ {
+ if (_drawningAirCraft == null)
+ {
+ return;
+ }
+
+ if (comboBoxStrategy.Enabled)
+ {
+ _strategy = comboBoxStrategy.SelectedIndex switch
+ {
+ 0 => new MoveToCenter(),
+ 1 => new MoveToBorder(),
+ _ => null,
+ };
+ if (_strategy == null)
+ {
+ return;
+ }
+ _strategy.SetData(new MoveableAirCraft(_drawningAirCraft), pictureBoxAirFighter.Width, pictureBoxAirFighter.Height);
+ }
+
+ if (_strategy == null)
+ {
+ return;
+ }
+
+ comboBoxStrategy.Enabled = false;
+ _strategy.MakeStep();
+ Draw();
+
+ if (_strategy.GetStatus() == StrategyStatus.Finish)
+ {
+ comboBoxStrategy.Enabled = true;
+ _strategy = null;
+ }
+ }
}
diff --git a/ProjectAirFighter/ProjectAirFighter/MovementStrategy/AbstractStrategy.cs b/ProjectAirFighter/ProjectAirFighter/MovementStrategy/AbstractStrategy.cs
new file mode 100644
index 0000000..35d01f1
--- /dev/null
+++ b/ProjectAirFighter/ProjectAirFighter/MovementStrategy/AbstractStrategy.cs
@@ -0,0 +1,139 @@
+namespace ProjectAirFighter.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;
+ }
+}
\ No newline at end of file
diff --git a/ProjectAirFighter/ProjectAirFighter/MovementStrategy/IMoveableObjectcs.cs b/ProjectAirFighter/ProjectAirFighter/MovementStrategy/IMoveableObjectcs.cs
new file mode 100644
index 0000000..2bdeaec
--- /dev/null
+++ b/ProjectAirFighter/ProjectAirFighter/MovementStrategy/IMoveableObjectcs.cs
@@ -0,0 +1,26 @@
+using ProjectAirFighter.MovementStrategy;
+
+namespace ProjectAirFighter.MovementStrategy;
+
+///
+/// Интерфейс для работы с перемещаемым объектом
+///
+public interface IMoveableObject
+{
+ ///
+ /// Получение координаты объекта
+ ///
+ ObjectParameters? GetObjectPosition { get; }
+
+ ///
+ /// Шаг объекта
+ ///
+ int GetStep { get; }
+
+ ///
+ /// Попытка переместить объект в указанном направлении
+ ///
+ /// Направление
+ /// true - объект перемещен, false - перемещение невозможно
+ bool TryMoveObject(MovementDirection direction);
+}
diff --git a/ProjectAirFighter/ProjectAirFighter/MovementStrategy/MoveToBorder.cs b/ProjectAirFighter/ProjectAirFighter/MovementStrategy/MoveToBorder.cs
new file mode 100644
index 0000000..e9b1e67
--- /dev/null
+++ b/ProjectAirFighter/ProjectAirFighter/MovementStrategy/MoveToBorder.cs
@@ -0,0 +1,53 @@
+namespace ProjectAirFighter.MovementStrategy;
+///
+/// Стратегия перемещения объекта в край экрана
+///
+public class MoveToBorder : AbstractStrategy
+{
+ protected override bool IsTargetDestinaion()
+ {
+ ObjectParameters? objParams = GetObjectParameters;
+ if (objParams == null)
+ {
+ return false;
+ }
+
+ return objParams.RightBorder + GetStep() >= FieldWidth && objParams.DownBorder + GetStep() >= FieldHeight;
+ }
+
+ protected override void MoveToTarget()
+ {
+ ObjectParameters? objParams = GetObjectParameters;
+ if (objParams == null)
+ {
+ return;
+ }
+
+ int diffX = objParams.RightBorder - FieldWidth;
+ if (Math.Abs(diffX) > GetStep())
+ {
+ if (diffX > 0)
+ {
+ MoveLeft();
+ }
+ else
+ {
+ MoveRight();
+ }
+ }
+
+ int diffY = objParams.DownBorder - FieldHeight;
+ if (Math.Abs(diffY) > GetStep())
+ {
+ if (diffY > GetStep())
+ {
+ MoveUp();
+ }
+ else
+ {
+ MoveDown();
+ }
+ }
+ }
+}
+
diff --git a/ProjectAirFighter/ProjectAirFighter/MovementStrategy/MoveToCenter.cs b/ProjectAirFighter/ProjectAirFighter/MovementStrategy/MoveToCenter.cs
new file mode 100644
index 0000000..b624bfc
--- /dev/null
+++ b/ProjectAirFighter/ProjectAirFighter/MovementStrategy/MoveToCenter.cs
@@ -0,0 +1,53 @@
+namespace ProjectAirFighter.MovementStrategy;
+///
+/// Стратегия перемещения объекта в центр экрана
+///
+public class MoveToCenter : AbstractStrategy
+{
+ protected override bool IsTargetDestinaion()
+ {
+ ObjectParameters? objParams = GetObjectParameters;
+ if (objParams == null)
+ {
+ return false;
+ }
+
+ return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth / 2 && objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
+ objParams.ObjectMiddleVertical - GetStep() <= 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();
+ }
+ }
+ }
+}
diff --git a/ProjectAirFighter/ProjectAirFighter/MovementStrategy/MoveableAirCraft.cs b/ProjectAirFighter/ProjectAirFighter/MovementStrategy/MoveableAirCraft.cs
new file mode 100644
index 0000000..787543d
--- /dev/null
+++ b/ProjectAirFighter/ProjectAirFighter/MovementStrategy/MoveableAirCraft.cs
@@ -0,0 +1,63 @@
+using ProjectAirFighter.Drawnings;
+using ProjectAirFighter.MovementStrategy;
+
+///
+/// Класс-реализация IMoveableObject с использованием DrawningCar
+///
+public class MoveableAirCraft : IMoveableObject
+{
+ ///
+ /// Поле-объект класса DrawningCar или его наследника
+ ///
+ private readonly DrawningAirCraft? _airCraft = null;
+
+ ///
+ /// Конструктор
+ ///
+ /// Объект класса DrawningCar
+ public MoveableAirCraft(DrawningAirCraft airCraft)
+ {
+ _airCraft = airCraft;
+ }
+
+ public ObjectParameters? GetObjectPosition
+ {
+ get
+ {
+ if (_airCraft == null || _airCraft.EntityAirCraft == null || !_airCraft.GetPosX.HasValue || !_airCraft.GetPosY.HasValue)
+ {
+ return null;
+ }
+ return new ObjectParameters(_airCraft.GetPosX.Value, _airCraft.GetPosY.Value, _airCraft.GetWidth, _airCraft.GetHeight);
+ }
+ }
+
+ public int GetStep => (int)(_airCraft?.EntityAirCraft?.Step ?? 0);
+
+ public bool TryMoveObject(MovementDirection direction)
+ {
+ if (_airCraft == null || _airCraft.EntityAirCraft == null)
+ {
+ return false;
+ }
+
+ return _airCraft.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,
+ };
+ }
+}
diff --git a/ProjectAirFighter/ProjectAirFighter/DirectionType.cs b/ProjectAirFighter/ProjectAirFighter/MovementStrategy/MovementDirection.cs
similarity index 81%
rename from ProjectAirFighter/ProjectAirFighter/DirectionType.cs
rename to ProjectAirFighter/ProjectAirFighter/MovementStrategy/MovementDirection.cs
index 66b140b..21d90c9 100644
--- a/ProjectAirFighter/ProjectAirFighter/DirectionType.cs
+++ b/ProjectAirFighter/ProjectAirFighter/MovementStrategy/MovementDirection.cs
@@ -1,9 +1,8 @@
-namespace ProjectAirFighter;
-
+namespace ProjectAirFighter.MovementStrategy;
///
/// Направление перемещения
///
-public enum DirectionType
+public enum MovementDirection
{
///
/// Вверх
@@ -24,4 +23,4 @@ public enum DirectionType
/// Вправо
///
Right = 4
-}
\ No newline at end of file
+}
diff --git a/ProjectAirFighter/ProjectAirFighter/MovementStrategy/ObjectParameters.cs b/ProjectAirFighter/ProjectAirFighter/MovementStrategy/ObjectParameters.cs
new file mode 100644
index 0000000..e23c13c
--- /dev/null
+++ b/ProjectAirFighter/ProjectAirFighter/MovementStrategy/ObjectParameters.cs
@@ -0,0 +1,71 @@
+namespace ProjectAirFighter.MovementStrategy;
+///
+/// Параметры-координаты объекта
+///
+public class ObjectParameters
+{
+ ///
+ /// Координата X
+ ///
+ private readonly int _x;
+
+ ///
+ /// Координата Y
+ ///
+ 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/ProjectAirFighter/ProjectAirFighter/MovementStrategy/StrategyStatus.cs b/ProjectAirFighter/ProjectAirFighter/MovementStrategy/StrategyStatus.cs
new file mode 100644
index 0000000..510aaa0
--- /dev/null
+++ b/ProjectAirFighter/ProjectAirFighter/MovementStrategy/StrategyStatus.cs
@@ -0,0 +1,22 @@
+namespace ProjectAirFighter.MovementStrategy;
+///
+/// Статус выполнения операции перемещения
+///
+public enum StrategyStatus
+{
+ ///
+ /// Всё готово к началу
+ ///
+ NotInit,
+
+ ///
+ /// Выполняется
+ ///
+ InProgress,
+
+ ///
+ /// Завершено
+ ///
+ Finish
+}
+