diff --git a/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/AbstractCompany.cs b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/AbstractCompany.cs
new file mode 100644
index 0000000..3062187
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/AbstractCompany.cs
@@ -0,0 +1,117 @@
+using ProjectStormtrooper.Drawnings;
+namespace ProjectStormtrooper.CollectionGenericObjects;
+
+///
+/// Абстракция компании, хранящий коллекцию бомбардировщиков
+///
+public abstract class AbstractCompany
+{
+ ///
+ /// Размер места (ширина)
+ ///
+ protected readonly int _placeSizeWidth = 220;
+
+ ///
+ /// Размер места (высота)
+ ///
+ protected readonly int _placeSizeHeight = 155;
+
+ ///
+ /// Ширина окна
+ ///
+ protected readonly int _pictureWidth;
+
+ ///
+ /// Высота окна
+ ///
+ protected readonly int _pictureHeight;
+ protected static int amountOfObjects = 0;
+ ///
+ /// Коллекция бомбардировщиков
+ ///
+ protected ICollectionGenericObjects? _collection = null;
+
+ public static int getAmountOfObjects() {
+ return amountOfObjects;
+ }
+
+ ///
+ /// Вычисление максимального количества элементов, который можно разместить в окне
+ ///
+ private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
+
+ ///
+ /// Конструктор
+ ///
+ /// Ширина окна
+ /// Высота окна
+ /// Коллекция бомбардировщиков
+ public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects collection)
+ {
+ _pictureWidth = picWidth;
+ _pictureHeight = picHeight;
+ _collection = collection;
+ _collection.SetMaxCount = GetMaxCount;
+ }
+
+ ///
+ /// Перегрузка оператора сложения для класса
+ ///
+ /// Компания
+ /// Добавляемый объект
+ ///
+ public static int operator +(AbstractCompany company, DrawningBaseStormtrooper stormtrooper)
+ {
+ return company._collection.Insert(stormtrooper);
+ }
+
+ ///
+ /// Перегрузка оператора удаления для класса
+ ///
+ /// Компания
+ /// Номер удаляемого объекта
+ ///
+ public static DrawningBaseStormtrooper operator -(AbstractCompany company, int position)
+ {
+ return company._collection.Remove(position);
+ }
+
+ ///
+ /// Получение случайного объекта из коллекции
+ ///
+ ///
+ public DrawningBaseStormtrooper? GetRandomObject()
+ {
+ Random rnd = new();
+ return _collection?.Get(rnd.Next(GetMaxCount));
+ }
+
+ ///
+ /// Вывод всей коллекции
+ ///
+ ///
+ public Bitmap? Show()
+ {
+ Bitmap bitmap = new(_pictureWidth, _pictureHeight);
+ Graphics graphics = Graphics.FromImage(bitmap);
+ DrawBackgound(graphics);
+ SetObjectsPosition();
+ for (int i = 0; i < (_collection?.Count ?? 0); ++i)
+ {
+ DrawningBaseStormtrooper? obj = _collection?.Get(i);
+ obj?.DrawTransport(graphics);
+ }
+ return bitmap;
+ }
+
+ ///
+ /// Вывод заднего фона
+ ///
+ ///
+ protected abstract void DrawBackgound(Graphics g);
+
+ ///
+ /// Расстановка объектов
+ ///
+ protected abstract void SetObjectsPosition();
+}
\ No newline at end of file
diff --git a/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/CollectionType.cs b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/CollectionType.cs
new file mode 100644
index 0000000..a2c9295
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/CollectionType.cs
@@ -0,0 +1,20 @@
+namespace ProjectStormtrooper.CollectionGenericObjects;
+
+///
+/// Тип коллекции
+///
+public enum CollectionType
+{
+ ///
+ /// Неопределено
+ ///
+ None = 0,
+ ///
+ /// Массив
+ ///
+ Massive = 1,
+ ///
+ /// Список
+ ///
+ List = 2
+}
\ No newline at end of file
diff --git a/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/ICollectionGenericObjects.cs
new file mode 100644
index 0000000..372b2ce
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/ICollectionGenericObjects.cs
@@ -0,0 +1,48 @@
+namespace ProjectStormtrooper.CollectionGenericObjects;
+
+///
+/// Интерфейс описания действий для набора хранимых объектов
+///
+/// Параметр: ограничение - ссылочный тип
+public interface ICollectionGenericObjects
+ where T : class
+{
+ ///
+ /// Количество объектов в коллекции
+ ///
+ int Count { get; }
+
+ ///
+ /// Установка максимального количества элементов
+ ///
+ int SetMaxCount { set; }
+
+ ///
+ /// Добавление объекта в коллекцию
+ ///
+ /// Добавляемый объект
+ /// true - вставка прошла удачно, false - вставка не удалась
+ int Insert(T obj);
+
+ ///
+ /// Добавление объекта в коллекцию на конкретную позицию
+ ///
+ /// Добавляемый объект
+ /// Позиция
+ /// true - вставка прошла удачно, false - вставка не удалась
+ int Insert(T obj, int position);
+
+ ///
+ /// Удаление объекта из коллекции с конкретной позиции
+ ///
+ /// Позиция
+ /// true - удаление прошло удачно, false - удаление не удалось
+ T Remove(int position);
+
+ ///
+ /// Получение объекта по позиции
+ ///
+ /// Позиция
+ /// Объект
+ T? Get(int position);
+}
\ No newline at end of file
diff --git a/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/ListGenericObjects.cs b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/ListGenericObjects.cs
new file mode 100644
index 0000000..0e15a69
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/ListGenericObjects.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectStormtrooper.CollectionGenericObjects;
+
+///
+/// Параметризованный набор объектов
+///
+/// Параметр: ограничение - ссылочный тип
+public class ListGenericObjects : ICollectionGenericObjects
+where T : class
+{
+ ///
+ /// Список объектов, которые храним
+ ///
+ private readonly List _collection;
+ ///
+ /// Максимально допустимое число объектов в списке
+ ///
+ private int _maxCount;
+ public int Count => _collection.Count;
+ public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
+ ///
+ /// Конструктор
+ ///
+ public ListGenericObjects()
+ {
+ _collection = new();
+ }
+ public T? Get(int position)
+ {
+ // TODO проверка позиции
+ if( position>= 0 && position < Count)
+ {
+ return _collection[position];
+ }
+ return null;
+ }
+ public int Insert(T obj)
+ {
+ // TODO проверка, что не превышено максимальное количество элементов
+ // TODO вставка в конец набора
+ if (Count <= _maxCount)
+ {
+ _collection.Add(obj);
+ return Count;
+ }
+ return -1;
+ }
+ public int Insert(T obj, int position)
+ {
+ // TODO проверка, что не превышено максимальное количество элементов
+ // TODO проверка позиции
+ // TODO вставка по позиции
+ if (Count < _maxCount && position>=0 && position < _maxCount)
+ {
+ _collection.Insert(position, obj);
+ return position;
+ }
+ return -1;
+ }
+ public T Remove(int position)
+ {
+ // TODO проверка позиции
+ // TODO удаление объекта из списка
+ T temp = _collection[position];
+ if(position>=0 && position < _maxCount)
+ {
+ _collection.RemoveAt(position);
+ return temp;
+ }
+ return null;
+ }
+
+}
+
diff --git a/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/MassiveGenericObjects.cs
new file mode 100644
index 0000000..2556922
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/MassiveGenericObjects.cs
@@ -0,0 +1,110 @@
+using ProjectStormtrooper.Drawnings;
+namespace ProjectStormtrooper.CollectionGenericObjects;
+
+///
+/// Параметризованный набор объектов
+///
+/// Параметр: ограничение - ссылочный тип
+public class MassiveGenericObjects : ICollectionGenericObjects
+ where T : class
+{
+ ///
+ /// Массив объектов, которые храним
+ ///
+ private T?[] _collection;
+
+ public int Count => _collection.Length;
+
+ public int SetMaxCount
+ {
+ set
+ {
+ if (value > 0)
+ {
+ if (_collection.Length > 0)
+ {
+ Array.Resize(ref _collection, value);
+ }
+ else
+ {
+ _collection = new T?[value];
+ }
+ }
+ }
+ }
+ ///
+ /// Конструктор
+ ///
+ public MassiveGenericObjects()
+ {
+ _collection = Array.Empty();
+ }
+
+ public T Get(int position)
+ {
+ // TODO проверка позиции
+ if (position >= _collection.Length || position < 0) return null;
+ return _collection[position];
+ }
+
+ public int Insert(T obj)
+ {
+ // TODO вставка в свободное место набора
+ int index = 0;
+ while(index< _collection.Length)
+ {
+ if (_collection[index] == null) {
+ _collection[index] = obj;
+ return index;
+ }
+ index++;
+ }
+ return -1;
+ }
+
+ public int Insert(T obj, int position)
+ {
+ // TODO проверка позиции
+ // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
+ // ищется свободное место после этой позиции и идет вставка туда
+ // если нет после, ищем до
+ // TODO вставка
+ if (position >= _collection.Length || position < 0) return -1;
+ if (_collection[position] == null)
+ {
+ _collection[position] = obj;
+ return position;
+ }
+ int index = position + 1;
+ while (index < _collection.Length)
+ {
+ if (_collection[index] == null)
+ {
+ _collection[index] = obj;
+ return index;
+ }
+ index++;
+ }
+ index = position - 1;
+ while (index >= 0)
+ {
+ if (_collection[index] == null)
+ {
+ _collection[index] = obj;
+ return index;
+ }
+ index--;
+ }
+ return -1;
+ }
+
+ public T? Remove(int position)
+ {
+ // TODO проверка позиции
+ // TODO удаление объекта из массива, присвоив элементу массива значение null
+ if (position >= _collection.Length || position < 0) return null;
+ T temp = _collection[position];
+ _collection[position] = null;
+ return temp;
+ }
+}
\ No newline at end of file
diff --git a/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/StorageCollection.cs b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/StorageCollection.cs
new file mode 100644
index 0000000..0c51784
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/StorageCollection.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectStormtrooper.CollectionGenericObjects;
+
+///
+/// Класс-хранилище коллекций
+///
+///
+public class StorageCollection
+where T : class
+{
+ ///
+ /// Словарь (хранилище) с коллекциями
+ ///
+ readonly Dictionary> _storages;
+ ///
+ /// Возвращение списка названий коллекций
+ ///
+ public List Keys => _storages.Keys.ToList();
+ ///
+ /// Конструктор
+ ///
+ public StorageCollection()
+ {
+ _storages = new Dictionary>();
+ }
+ ///
+ /// Добавление коллекции в хранилище
+ ///
+ /// Название коллекции
+ /// тип коллекции
+ public void AddCollection(string name, CollectionType collectionType)
+ {
+ // TODO проверка, что name не пустой и нет в словаре записи с таким ключом
+ // TODO Прописать логику для добавления
+ if(!(collectionType == CollectionType.None) && !_storages.ContainsKey(name)){
+ if(collectionType== CollectionType.List)
+ {
+ _storages.Add(name, new ListGenericObjects());
+ }
+ else if (collectionType == CollectionType.Massive)
+ {
+ _storages.Add(name, new MassiveGenericObjects());
+ }
+ }
+ }
+ ///
+ /// Удаление коллекции
+ ///
+ /// Название коллекции
+ public void DelCollection(string name)
+ {
+ // TODO Прописать логику для удаления коллекции
+ if (_storages.ContainsKey(name)) { _storages.Remove(name); }
+ }
+ ///
+ /// Доступ к коллекции
+ ///
+ /// Название коллекции
+ ///
+ public ICollectionGenericObjects? this[string name]
+ {
+ get
+ {
+ // TODO Продумать логику получения объекта
+ if (_storages.ContainsKey(name))
+ {
+ return _storages[name];
+ }
+ return null;
+ }
+ }
+}
+
diff --git a/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/StormtrooperSharingService.cs b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/StormtrooperSharingService.cs
new file mode 100644
index 0000000..e8143f5
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/StormtrooperSharingService.cs
@@ -0,0 +1,58 @@
+using ProjectStormtrooper.Drawnings;
+namespace ProjectStormtrooper.CollectionGenericObjects;
+///
+/// Реализация абстрактной компании - бомбардиршеринг
+///
+public class StormtrooperSharingService : AbstractCompany
+{
+ ///
+ /// Конструктор
+ ///
+ ///
+ ///
+ ///
+ public StormtrooperSharingService(int picWidth, int picHeight, ICollectionGenericObjects collection) : base(picWidth, picHeight, collection)
+ {
+ }
+ protected override void DrawBackgound(Graphics g)
+ {
+ int width = _pictureWidth / _placeSizeWidth;
+ int height = _pictureHeight / _placeSizeHeight;
+ Pen pen = new(Color.Black, 2);
+ for (int i = 0; i < width; i++)
+ {
+ for (int j = 0; j < height + 1; ++j)
+ {
+ g.DrawLine(pen, i * _placeSizeWidth+15, j * _placeSizeHeight, i * _placeSizeWidth+15 + _placeSizeWidth-55, j * _placeSizeHeight);
+ g.DrawLine(pen, i * _placeSizeWidth+15, j * _placeSizeHeight, i * _placeSizeWidth+15, j * _placeSizeHeight -_placeSizeHeight);
+ }
+ }
+ }
+
+ protected override void SetObjectsPosition()
+ {
+ int width = _pictureWidth / _placeSizeWidth;
+ int height = _pictureHeight / _placeSizeHeight;
+ int curWidth = width-1;
+ int curHeight = 0;
+ for (int i = 0; i < (_collection?.Count ?? 0); i++)
+ {
+ if (_collection.Get(i) != null)
+ {
+ _collection.Get(i).SetPictureSize(_pictureWidth, _pictureHeight);
+ _collection.Get(i).SetPosition(_placeSizeWidth * curWidth + 15, curHeight * _placeSizeHeight + 3);
+ }
+ if (curWidth >0)
+ curWidth--;
+ else
+ {
+ curWidth = width -1;
+ curHeight++;
+ }
+ if (curHeight > height)
+ {
+ return;
+ }
+ }
+ }
+}
diff --git a/ProjectStormtrooper/ProjectStormtrooper/Drawnings/DirectionType.cs b/ProjectStormtrooper/ProjectStormtrooper/Drawnings/DirectionType.cs
new file mode 100644
index 0000000..6240396
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/Drawnings/DirectionType.cs
@@ -0,0 +1,28 @@
+namespace ProjectStormtrooper;
+
+///
+/// Направление перемещения
+///
+public enum DirectionType
+{
+ ///
+ /// Неизвестное значение
+ ///
+ Unknow= -1,
+ ///
+ /// Вверх
+ ///
+ Up = 1,
+ ///
+ /// Вниз
+ ///
+ Down = 2,
+ ///
+ /// Влево
+ ///
+ Left = 3,
+ ///
+ /// Вправо
+ ///
+ Right = 4
+}
diff --git a/ProjectStormtrooper/ProjectStormtrooper/Drawnings/DrawingStormtrooper.cs b/ProjectStormtrooper/ProjectStormtrooper/Drawnings/DrawingStormtrooper.cs
new file mode 100644
index 0000000..d8c1982
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/Drawnings/DrawingStormtrooper.cs
@@ -0,0 +1,53 @@
+using ProjectStormtrooper.Entities;
+namespace ProjectStormtrooper.Drawnings;
+
+///
+/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
+///
+public class DrawingStormtrooper : DrawningBaseStormtrooper
+{
+ ///
+ /// Конструктор
+ ///
+ /// Скорость
+ /// Вес
+ /// Основной цвет
+ /// Дополнительный цвет
+ /// Признак наличия бомб
+ /// Признак наличия ракет
+ public DrawingStormtrooper(int speed, double weight, Color bodyColor, Color additionalColor, bool bombs, bool rockets) : base(140, 135)
+ {
+ EntityBaseStormtrooper = new EntityStormtrooper(speed, weight, bodyColor, additionalColor, bombs, rockets);
+ }
+ ///
+ /// Прорисовка объекта
+ ///
+ ///
+ public override void DrawTransport(Graphics g)
+ {
+ if (EntityBaseStormtrooper == null ||EntityBaseStormtrooper is not EntityStormtrooper entityStormtrooper|| !_startPosX.HasValue ||!_startPosY.HasValue)
+ {
+ return;
+ }
+ Pen pen = new(Color.Black);
+ Brush additionalBrush = new SolidBrush(entityStormtrooper.AdditionalColor);
+
+ base.DrawTransport(g);
+ //Ракеты бомбардировщика
+ if (entityStormtrooper.Rockets)
+ {
+ g.FillRectangle(additionalBrush, _startPosX.Value + 35, _startPosY.Value + 20, 15, 5);
+ g.FillRectangle(additionalBrush, _startPosX.Value + 35, _startPosY.Value + 110, 15, 5);
+
+ }
+ //Бомбы бомбардировщика
+ if (entityStormtrooper.Bombs)
+ {
+ g.FillRectangle(additionalBrush, _startPosX.Value + 40, _startPosY.Value + 40, 10, 10);
+ g.FillRectangle(additionalBrush, _startPosX.Value + 40, _startPosY.Value + 90, 10, 10);
+ }
+ }
+}
+
+
+
diff --git a/ProjectStormtrooper/ProjectStormtrooper/Drawnings/DrawningBaseStormtrooper.cs b/ProjectStormtrooper/ProjectStormtrooper/Drawnings/DrawningBaseStormtrooper.cs
new file mode 100644
index 0000000..c6d6575
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/Drawnings/DrawningBaseStormtrooper.cs
@@ -0,0 +1,247 @@
+using ProjectStormtrooper.Entities;
+namespace ProjectStormtrooper.Drawnings;
+
+public class DrawningBaseStormtrooper
+{
+ public EntityBaseStormtrooper? EntityBaseStormtrooper { get; protected set; }
+ ///
+ /// Ширина окна
+ ///
+ private int? _pictureWidth;
+
+ ///
+ /// Высота окна
+ ///
+ private int? _pictureHeight;
+
+ ///
+ /// Левая координата прорисовки бомбардировщика
+ ///
+ protected int? _startPosX;
+
+ ///
+ /// Верхняя кооридната прорисовки бомбардировщика
+ ///
+ protected int? _startPosY;
+
+ ///
+ /// Ширина прорисовки бомбардировщика
+ ///
+ private readonly int _drawningStormtrooperWidth = 140;
+
+ ///
+ /// Высота прорисовки бомбардировщика
+ ///
+ private readonly int _drawningStormtrooperHeight = 135;
+
+ ///
+ /// Координата X объекта
+ ///
+ public int? GetPosX => _startPosX;
+
+ ///
+ /// Координата Y объекта
+ ///
+ public int? GetPosY => _startPosY;
+
+ ///
+ /// Ширина объекта
+ ///
+ public int GetWidth => _drawningStormtrooperWidth;
+
+ ///
+ /// Высота объекта
+ ///
+ public int GetHeight => _drawningStormtrooperHeight;
+
+ ///
+ /// Пустой конструктор
+ ///
+ public DrawningBaseStormtrooper()
+ {
+ _pictureWidth = null;
+ _pictureHeight = null;
+ _startPosX = null;
+ _startPosY = null;
+ }
+
+ ///
+ /// Конструктор
+ ///
+ /// Скорость
+ /// Вес
+ /// Основной цвет
+ public DrawningBaseStormtrooper(int speed, double weight, Color bodyColor) : this()
+ {
+ EntityBaseStormtrooper = new EntityBaseStormtrooper(speed, weight, bodyColor);
+ }
+
+ ///
+ /// Конструктор для наследников
+ ///
+ /// Ширина прорисовки бомбардировщика
+ /// Высота прорисовки бомбардировщика
+ protected DrawningBaseStormtrooper(int drawningStormtrooperWidth ,int drawningStormtrooperHeight ) : this()
+ {
+ _drawningStormtrooperHeight= drawningStormtrooperHeight;
+ _drawningStormtrooperWidth= drawningStormtrooperWidth;
+ }
+
+ ///
+ /// Установка границ поля
+ ///
+ /// Ширина поля
+ /// Высота поля
+ /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах
+ public bool SetPictureSize(int width, int height)
+ {
+ // TODO проверка, что объект "влезает" в размеры поля
+ // если влезает, сохраняем границы и корректируем позицию объекта, если она была уже установлена
+ if (width < _drawningStormtrooperWidth || height < _drawningStormtrooperHeight) return false;
+ _pictureWidth = width;
+ _pictureHeight = height;
+ if (_startPosX != null && _startPosY != null)
+ {
+ if (_startPosX + _drawningStormtrooperWidth > _pictureWidth)
+ {
+ _startPosX = -_drawningStormtrooperWidth + _pictureWidth;
+ }
+ else if (_startPosX < 0)
+ {
+ _startPosX = 0;
+ }
+ if (_startPosY + _drawningStormtrooperHeight > _pictureHeight)
+ {
+ _startPosY = -_drawningStormtrooperHeight + _pictureHeight;
+ }
+ else if (_startPosY < 0)
+ {
+ _startPosY = 0;
+ }
+ }
+ return true;
+ }
+ ///
+ /// Установка позиции
+ ///
+ /// Координата X
+ /// Координата Y
+ public void SetPosition(int x, int y)
+ {
+ if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
+ {
+ return;
+ }
+ // TODO если при установке объекта в эти координаты, он будет "выходить" за границы формы
+ // то надо изменить координаты, чтобы он оставался в этих границах
+ if (x + _drawningStormtrooperWidth > _pictureWidth)
+ {
+ _startPosX = x - (x + _drawningStormtrooperWidth - _pictureWidth);
+ }
+ else if (x < 0)
+ {
+ _startPosX = 0;
+ }
+ else
+ {
+ _startPosX = x;
+ }
+ if (y + _drawningStormtrooperHeight > _pictureHeight)
+ {
+ _startPosY = y - (y + _drawningStormtrooperHeight - _pictureHeight);
+ }
+ else if (y < 0)
+ {
+ _startPosY = 0;
+ }
+ else
+ {
+ _startPosY = y;
+ }
+ }
+
+ ///
+ /// Изменение направления перемещения
+ ///
+ /// Направление
+ /// true - перемещене выполнено, false - перемещение невозможно
+ public bool MoveTransport(DirectionType direction)
+ {
+ if (EntityBaseStormtrooper == null || !_startPosX.HasValue ||
+ !_startPosY.HasValue)
+ {
+ return false;
+ }
+ switch (direction)
+ {
+ //влево
+ case DirectionType.Left:
+ if (_startPosX.Value - EntityBaseStormtrooper.Step > 0)
+ {
+ _startPosX -= (int)EntityBaseStormtrooper.Step;
+ }
+ return true;
+ //вверх
+ case DirectionType.Up:
+ if (_startPosY.Value - EntityBaseStormtrooper.Step > 0)
+ {
+ _startPosY -= (int)EntityBaseStormtrooper.Step;
+ }
+ return true;
+ // вправо
+ case DirectionType.Right:
+ //TODO прописать логику сдвига в право
+ if (_startPosX + _drawningStormtrooperWidth + EntityBaseStormtrooper.Step < _pictureWidth)
+ {
+ _startPosX += (int)EntityBaseStormtrooper.Step;
+ };
+ return true;
+ //вниз
+ case DirectionType.Down:
+ //TODO прописать логику сдвига в вниз
+ if (_startPosY + _drawningStormtrooperHeight + EntityBaseStormtrooper.Step < _pictureHeight)
+ {
+ _startPosY += (int)EntityBaseStormtrooper.Step;
+ }
+ return true;
+ default:
+ return false;
+ }
+ }
+ ///
+ /// Прорисовка объекта
+ ///
+ ///
+ public virtual void DrawTransport(Graphics g)
+ {
+ if (EntityBaseStormtrooper == null || !_startPosX.HasValue ||
+ !_startPosY.HasValue)
+ {
+ return;
+ }
+ Pen pen = new(Color.Black);
+ Brush bodyColorBrush = new SolidBrush(EntityBaseStormtrooper.BodyColor);
+ //Тело бомбардировщика
+ g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 60, 120, 20);
+ //Задние крылья бомбардировщика
+ g.DrawLine(pen, _startPosX.Value + 140, _startPosY.Value + 30, _startPosX.Value + 140, _startPosY.Value + 110);
+ g.DrawLine(pen, _startPosX.Value + 140, _startPosY.Value + 110, _startPosX.Value + 120, _startPosY.Value + 90);
+ g.DrawLine(pen, _startPosX.Value + 120, _startPosY.Value + 90, _startPosX.Value + 120, _startPosY.Value + 80);
+ g.DrawLine(pen, _startPosX.Value + 140, _startPosY.Value + 30, _startPosX.Value + 120, _startPosY.Value + 50);
+ g.DrawLine(pen, _startPosX.Value + 120, _startPosY.Value + 50, _startPosX.Value + 120, _startPosY.Value + 60);
+ //Крылья бомбардировщика
+ g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value, _startPosX.Value + 50, _startPosY.Value + 60);
+ g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 80, _startPosX.Value + 50, _startPosY.Value + 135);
+ g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 135, _startPosX.Value + 60, _startPosY.Value + 135);
+ g.DrawLine(pen, _startPosX.Value + 60, _startPosY.Value + 135, _startPosX.Value + 65, _startPosY.Value + 80);
+ g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value, _startPosX.Value + 60, _startPosY.Value);
+ g.DrawLine(pen, _startPosX.Value + 60, _startPosY.Value, _startPosX.Value + 65, _startPosY.Value + 60);
+ ///Нос бомбардировщика
+ Point[] Nose = new Point[3];
+ Nose[0].X = _startPosX.Value + 20; Nose[0].Y = _startPosY.Value + 80;
+ Nose[1].X = _startPosX.Value; Nose[1].Y = _startPosY.Value + 70;
+ Nose[2].X = _startPosX.Value + 20; Nose[2].Y = _startPosY.Value + 60;
+ g.FillPolygon(bodyColorBrush, Nose);
+ }
+}
+
diff --git a/ProjectStormtrooper/ProjectStormtrooper/Entities/EntityBaseStormtrooper.cs b/ProjectStormtrooper/ProjectStormtrooper/Entities/EntityBaseStormtrooper.cs
new file mode 100644
index 0000000..9f67ba4
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/Entities/EntityBaseStormtrooper.cs
@@ -0,0 +1,40 @@
+namespace ProjectStormtrooper.Entities;
+///
+/// Класс-сущность "Базовый Бомбардировщик"
+///
+public class EntityBaseStormtrooper
+{
+ ///
+ /// Скорость
+ ///
+ 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 EntityBaseStormtrooper(int speed, double weight, Color bodyColor)
+ {
+ Speed = speed;
+ Weight = weight;
+ BodyColor = bodyColor;
+ }
+}
diff --git a/ProjectStormtrooper/ProjectStormtrooper/Entities/EntityStormtrooper.cs b/ProjectStormtrooper/ProjectStormtrooper/Entities/EntityStormtrooper.cs
new file mode 100644
index 0000000..1a52a13
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/Entities/EntityStormtrooper.cs
@@ -0,0 +1,41 @@
+namespace ProjectStormtrooper.Entities;
+
+///
+/// Класс-сущность "Бомбардировщик"
+///
+public class EntityStormtrooper : EntityBaseStormtrooper
+{
+
+ ///
+ /// Дополнительный цвет (для опциональных элементов)
+ ///
+ public Color AdditionalColor { get; protected set; }
+
+ ///
+ /// Признак (опция) наличия ракет
+ ///
+ public bool Rockets { get; private set; }
+
+ ///
+ /// Признак (опция) наличия бомб
+ ///
+ public bool Bombs { get; private set; }
+
+ ///
+ /// Конструктор
+ ///
+ /// Скорость
+ /// Вес бомбардировщика
+ /// Основной цвет
+ /// Дополнительный цвет
+ /// Признак наличия бомб
+ /// Признак наличия ракет
+ public EntityStormtrooper(int speed, double weight, Color bodyColor, Color additionalColor, bool bombs, bool rockets) : base(speed, weight, bodyColor)
+ {
+ AdditionalColor = additionalColor;
+ Bombs = bombs;
+ Rockets = rockets;
+ }
+}
+
+
diff --git a/ProjectStormtrooper/ProjectStormtrooper/Form1.Designer.cs b/ProjectStormtrooper/ProjectStormtrooper/Form1.Designer.cs
deleted file mode 100644
index 68d6185..0000000
--- a/ProjectStormtrooper/ProjectStormtrooper/Form1.Designer.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-namespace ProjectStormtrooper
-{
- partial class Form1
- {
- ///
- /// 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.components = new System.ComponentModel.Container();
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(800, 450);
- this.Text = "Form1";
- }
-
- #endregion
- }
-}
\ No newline at end of file
diff --git a/ProjectStormtrooper/ProjectStormtrooper/Form1.cs b/ProjectStormtrooper/ProjectStormtrooper/Form1.cs
deleted file mode 100644
index 638b855..0000000
--- a/ProjectStormtrooper/ProjectStormtrooper/Form1.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace ProjectStormtrooper
-{
- public partial class Form1 : Form
- {
- public Form1()
- {
- InitializeComponent();
- }
- }
-}
\ No newline at end of file
diff --git a/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooper.Designer.cs b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooper.Designer.cs
new file mode 100644
index 0000000..302bb60
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooper.Designer.cs
@@ -0,0 +1,146 @@
+namespace ProjectStormtrooper
+{
+ partial class FormStormtrooper
+ {
+ ///
+ /// 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()
+ {
+ buttonUp = new Button();
+ buttonRight = new Button();
+ buttonDown = new Button();
+ buttonLeft = new Button();
+ pictureBoxStormtrooper = new PictureBox();
+ comboBoxStrategy = new ComboBox();
+ ButtonStrategyStep = new Button();
+ ((System.ComponentModel.ISupportInitialize)pictureBoxStormtrooper).BeginInit();
+ SuspendLayout();
+ //
+ // buttonUp
+ //
+ buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonUp.BackgroundImage = Properties.Resources.arrowUp;
+ buttonUp.BackgroundImageLayout = ImageLayout.Stretch;
+ buttonUp.Location = new Point(1130, 633);
+ buttonUp.Name = "buttonUp";
+ buttonUp.Size = new Size(35, 35);
+ buttonUp.TabIndex = 1;
+ buttonUp.UseVisualStyleBackColor = true;
+ buttonUp.Click += ButtonMove_Click;
+ //
+ // buttonRight
+ //
+ buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonRight.BackgroundImage = Properties.Resources.arrowRight;
+ buttonRight.BackgroundImageLayout = ImageLayout.Stretch;
+ buttonRight.Location = new Point(1171, 674);
+ buttonRight.Name = "buttonRight";
+ buttonRight.Size = new Size(35, 35);
+ buttonRight.TabIndex = 2;
+ buttonRight.UseVisualStyleBackColor = true;
+ buttonRight.Click += ButtonMove_Click;
+ //
+ // buttonDown
+ //
+ buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonDown.BackgroundImage = Properties.Resources.arrowDown;
+ buttonDown.BackgroundImageLayout = ImageLayout.Stretch;
+ buttonDown.Location = new Point(1130, 674);
+ buttonDown.Name = "buttonDown";
+ buttonDown.Size = new Size(35, 35);
+ buttonDown.TabIndex = 3;
+ buttonDown.UseVisualStyleBackColor = true;
+ buttonDown.Click += ButtonMove_Click;
+ //
+ // buttonLeft
+ //
+ buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonLeft.BackgroundImage = Properties.Resources.arrowLeft;
+ buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
+ buttonLeft.Location = new Point(1089, 674);
+ buttonLeft.Name = "buttonLeft";
+ buttonLeft.Size = new Size(35, 35);
+ buttonLeft.TabIndex = 4;
+ buttonLeft.UseVisualStyleBackColor = true;
+ buttonLeft.Click += ButtonMove_Click;
+ //
+ // pictureBoxStormtrooper
+ //
+ pictureBoxStormtrooper.Dock = DockStyle.Fill;
+ pictureBoxStormtrooper.Location = new Point(0, 0);
+ pictureBoxStormtrooper.Name = "pictureBoxStormtrooper";
+ pictureBoxStormtrooper.Size = new Size(1260, 737);
+ pictureBoxStormtrooper.TabIndex = 5;
+ pictureBoxStormtrooper.TabStop = false;
+ pictureBoxStormtrooper.Click += ButtonMove_Click;
+ //
+ // comboBoxStrategy
+ //
+ comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+ comboBoxStrategy.FormattingEnabled = true;
+ comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+ comboBoxStrategy.Location = new Point(1127, 12);
+ comboBoxStrategy.Name = "comboBoxStrategy";
+ comboBoxStrategy.Size = new Size(121, 23);
+ comboBoxStrategy.TabIndex = 7;
+ //
+ // ButtonStrategyStep
+ //
+ ButtonStrategyStep.Location = new Point(1173, 41);
+ ButtonStrategyStep.Name = "ButtonStrategyStep";
+ ButtonStrategyStep.Size = new Size(75, 23);
+ ButtonStrategyStep.TabIndex = 8;
+ ButtonStrategyStep.Text = "Шаг";
+ ButtonStrategyStep.UseVisualStyleBackColor = true;
+ ButtonStrategyStep.Click += ButtonStrategyStep_Click;
+ //
+ // FormStormtrooper
+ //
+ AutoScaleDimensions = new SizeF(7F, 15F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(1260, 737);
+ Controls.Add(ButtonStrategyStep);
+ Controls.Add(comboBoxStrategy);
+ Controls.Add(buttonLeft);
+ Controls.Add(buttonDown);
+ Controls.Add(buttonRight);
+ Controls.Add(buttonUp);
+ Controls.Add(pictureBoxStormtrooper);
+ Name = "FormStormtrooper";
+ Text = "Бомбардировщик";
+ ((System.ComponentModel.ISupportInitialize)pictureBoxStormtrooper).EndInit();
+ ResumeLayout(false);
+ }
+
+ #endregion
+ private Button buttonUp;
+ private Button buttonRight;
+ private Button buttonDown;
+ private Button buttonLeft;
+ private PictureBox pictureBoxStormtrooper;
+ private ComboBox comboBoxStrategy;
+ private Button ButtonStrategyStep;
+ }
+}
\ No newline at end of file
diff --git a/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooper.cs b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooper.cs
new file mode 100644
index 0000000..6c7306a
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooper.cs
@@ -0,0 +1,128 @@
+using ProjectStormtrooper.Drawnings;
+using ProjectStormtrooper.MovementStrategy;
+
+namespace ProjectStormtrooper
+{
+ ///
+ /// Форма работы с объектом "Бомбардировщик"
+ ///
+ public partial class FormStormtrooper : Form
+ {
+ ///
+ /// Поле-объект для прорисовки объекта
+ ///
+ private DrawningBaseStormtrooper? _drawningBaseStormtrooper;
+
+ private AbstractStrategy? _strategy;
+ ///
+ /// Конструктор формы
+ ///
+ public DrawningBaseStormtrooper SetStormtrooper
+ {
+ set
+ {
+ _drawningBaseStormtrooper = value;
+ _drawningBaseStormtrooper.SetPictureSize(pictureBoxStormtrooper.Width, pictureBoxStormtrooper.Height);
+ comboBoxStrategy.Enabled = true;
+ _strategy = null;
+ Draw();
+ }
+ }
+ public FormStormtrooper()
+ {
+ InitializeComponent();
+ _strategy = null;
+ }
+ ///
+ /// Метод прорисовки бомбардировщика
+ ///
+ private void Draw()
+ {
+ if (_drawningBaseStormtrooper == null)
+ {
+ return;
+ }
+ Bitmap bmp = new(pictureBoxStormtrooper.Width,
+ pictureBoxStormtrooper.Height);
+ Graphics gr = Graphics.FromImage(bmp);
+ _drawningBaseStormtrooper.DrawTransport(gr);
+ pictureBoxStormtrooper.Image = bmp;
+ }
+
+ ///
+ /// Перемещение объекта по форме (нажатие кнопок навигации)
+ ///
+ ///
+ ///
+ private void ButtonMove_Click(object sender, EventArgs e)
+ {
+ if (_drawningBaseStormtrooper == null)
+ {
+ return;
+ }
+ string name = ((Button)sender)?.Name ?? string.Empty;
+ bool result = false;
+ switch (name)
+ {
+ case "buttonUp":
+ result =
+ _drawningBaseStormtrooper.MoveTransport(DirectionType.Up);
+ break;
+ case "buttonDown":
+ result =
+ _drawningBaseStormtrooper.MoveTransport(DirectionType.Down);
+ break;
+ case "buttonLeft":
+ result =
+ _drawningBaseStormtrooper.MoveTransport(DirectionType.Left);
+ break;
+ case "buttonRight":
+ result =
+ _drawningBaseStormtrooper.MoveTransport(DirectionType.Right);
+ break;
+ }
+ if (result)
+ {
+ Draw();
+ }
+ }
+
+ private void ButtonStrategyStep_Click(object sender, EventArgs e)
+ {
+
+ if (_drawningBaseStormtrooper == null)
+ {
+ return;
+ }
+
+ if (comboBoxStrategy.Enabled)
+ {
+ _strategy = comboBoxStrategy.SelectedIndex switch
+ {
+ 0 => new MoveToCenter(),
+ 1 => new MoveToBorder(),
+ _ => null,
+ };
+ if (_strategy == null)
+ {
+ return;
+ }
+ _strategy.SetData(new MoveableStormtrooper(_drawningBaseStormtrooper), pictureBoxStormtrooper.Width, pictureBoxStormtrooper.Height);
+ }
+
+ if (_strategy == null)
+ {
+ return;
+ }
+ comboBoxStrategy.Enabled = false;
+ _strategy.MakeStep();
+ Draw();
+
+ if (_strategy.GetStatus() == StrategyStatus.Finish)
+ {
+ comboBoxStrategy.Enabled = true;
+ _strategy = null;
+ }
+ }
+ }
+}
diff --git a/ProjectStormtrooper/ProjectStormtrooper/Form1.resx b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooper.resx
similarity index 93%
rename from ProjectStormtrooper/ProjectStormtrooper/Form1.resx
rename to ProjectStormtrooper/ProjectStormtrooper/FormStormtrooper.resx
index 1af7de1..af32865 100644
--- a/ProjectStormtrooper/ProjectStormtrooper/Form1.resx
+++ b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooper.resx
@@ -1,17 +1,17 @@
-
diff --git a/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.Designer.cs b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.Designer.cs
new file mode 100644
index 0000000..9dbb7dc
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.Designer.cs
@@ -0,0 +1,297 @@
+namespace ProjectStormtrooper
+{
+ partial class FormStormtrooperCollection
+ {
+ ///
+ /// 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()
+ {
+ groupBoxTools = new GroupBox();
+ panelCompanyTools = new Panel();
+ buttonCreateCompany = new Button();
+ buttonAddBaseStormtrooper = new Button();
+ buttonAddStormtrooper = new Button();
+ buttonRefresh = new Button();
+ maskedTextBoxPosition = new MaskedTextBox();
+ buttonGoToCheck = new Button();
+ buttonRemoveStormtrooper = new Button();
+ panelStorage = new Panel();
+ buttonCollectionDel = new Button();
+ listBoxCollection = new ListBox();
+ buttonCollectionAdd = new Button();
+ radioButtonList = new RadioButton();
+ radioButtonMassive = new RadioButton();
+ textBoxCollectionName = new TextBox();
+ labelCollectionName = new Label();
+ comboBoxSelectorCompany = new ComboBox();
+ pictureBox = new PictureBox();
+ groupBoxTools.SuspendLayout();
+ panelCompanyTools.SuspendLayout();
+ panelStorage.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+ SuspendLayout();
+ //
+ // groupBoxTools
+ //
+ groupBoxTools.Controls.Add(panelCompanyTools);
+ groupBoxTools.Controls.Add(panelStorage);
+ groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+ groupBoxTools.Dock = DockStyle.Right;
+ groupBoxTools.Location = new Point(898, 0);
+ groupBoxTools.Name = "groupBoxTools";
+ groupBoxTools.Size = new Size(225, 659);
+ groupBoxTools.TabIndex = 0;
+ groupBoxTools.TabStop = false;
+ groupBoxTools.Text = "Инструменты";
+ //
+ // panelCompanyTools
+ //
+ panelCompanyTools.Controls.Add(buttonCreateCompany);
+ panelCompanyTools.Controls.Add(buttonAddBaseStormtrooper);
+ panelCompanyTools.Controls.Add(buttonAddStormtrooper);
+ panelCompanyTools.Controls.Add(buttonRefresh);
+ panelCompanyTools.Controls.Add(maskedTextBoxPosition);
+ panelCompanyTools.Controls.Add(buttonGoToCheck);
+ panelCompanyTools.Controls.Add(buttonRemoveStormtrooper);
+ panelCompanyTools.Dock = DockStyle.Bottom;
+ panelCompanyTools.Enabled = false;
+ panelCompanyTools.Location = new Point(3, 299);
+ panelCompanyTools.Name = "panelCompanyTools";
+ panelCompanyTools.Size = new Size(219, 357);
+ panelCompanyTools.TabIndex = 8;
+ //
+ // buttonCreateCompany
+ //
+ buttonCreateCompany.Location = new Point(3, 3);
+ buttonCreateCompany.Name = "buttonCreateCompany";
+ buttonCreateCompany.Size = new Size(213, 23);
+ buttonCreateCompany.TabIndex = 7;
+ buttonCreateCompany.Text = "Создать компанию";
+ buttonCreateCompany.UseVisualStyleBackColor = true;
+ buttonCreateCompany.Click += buttonCreateCompany_Click;
+ //
+ // buttonAddBaseStormtrooper
+ //
+ buttonAddBaseStormtrooper.Location = new Point(3, 90);
+ buttonAddBaseStormtrooper.Name = "buttonAddBaseStormtrooper";
+ buttonAddBaseStormtrooper.Size = new Size(213, 52);
+ buttonAddBaseStormtrooper.TabIndex = 1;
+ buttonAddBaseStormtrooper.Text = "Добавление базового бомбардировщика";
+ buttonAddBaseStormtrooper.UseVisualStyleBackColor = true;
+ buttonAddBaseStormtrooper.Click += buttonAddBaseStormtrooper_Click;
+ //
+ // buttonAddStormtrooper
+ //
+ buttonAddStormtrooper.Location = new Point(3, 32);
+ buttonAddStormtrooper.Name = "buttonAddStormtrooper";
+ buttonAddStormtrooper.Size = new Size(213, 52);
+ buttonAddStormtrooper.TabIndex = 2;
+ buttonAddStormtrooper.Text = "Добавление бомбардировщика";
+ buttonAddStormtrooper.UseVisualStyleBackColor = true;
+ buttonAddStormtrooper.Click += buttonAddStormtrooper_Click;
+ //
+ // buttonRefresh
+ //
+ buttonRefresh.Location = new Point(3, 293);
+ buttonRefresh.Name = "buttonRefresh";
+ buttonRefresh.Size = new Size(213, 52);
+ buttonRefresh.TabIndex = 6;
+ buttonRefresh.Text = "Обновить";
+ buttonRefresh.UseVisualStyleBackColor = true;
+ buttonRefresh.Click += buttonRefresh_Click;
+ //
+ // maskedTextBoxPosition
+ //
+ maskedTextBoxPosition.Location = new Point(3, 148);
+ maskedTextBoxPosition.Mask = "00";
+ maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+ maskedTextBoxPosition.Size = new Size(213, 23);
+ maskedTextBoxPosition.TabIndex = 3;
+ maskedTextBoxPosition.ValidatingType = typeof(int);
+ //
+ // buttonGoToCheck
+ //
+ buttonGoToCheck.Location = new Point(3, 235);
+ buttonGoToCheck.Name = "buttonGoToCheck";
+ buttonGoToCheck.Size = new Size(213, 52);
+ buttonGoToCheck.TabIndex = 5;
+ buttonGoToCheck.Text = "Передать на тесты";
+ buttonGoToCheck.UseVisualStyleBackColor = true;
+ buttonGoToCheck.Click += buttonGoToCheck_Click;
+ //
+ // buttonRemoveStormtrooper
+ //
+ buttonRemoveStormtrooper.Location = new Point(3, 177);
+ buttonRemoveStormtrooper.Name = "buttonRemoveStormtrooper";
+ buttonRemoveStormtrooper.Size = new Size(213, 52);
+ buttonRemoveStormtrooper.TabIndex = 4;
+ buttonRemoveStormtrooper.Text = "Удалить бомбардировщик";
+ buttonRemoveStormtrooper.UseVisualStyleBackColor = true;
+ buttonRemoveStormtrooper.Click += buttonRemoveStormtrooper_Click;
+ //
+ // panelStorage
+ //
+ panelStorage.Controls.Add(buttonCollectionDel);
+ panelStorage.Controls.Add(listBoxCollection);
+ panelStorage.Controls.Add(buttonCollectionAdd);
+ panelStorage.Controls.Add(radioButtonList);
+ panelStorage.Controls.Add(radioButtonMassive);
+ panelStorage.Controls.Add(textBoxCollectionName);
+ panelStorage.Controls.Add(labelCollectionName);
+ panelStorage.Dock = DockStyle.Top;
+ panelStorage.Location = new Point(3, 19);
+ panelStorage.Name = "panelStorage";
+ panelStorage.Size = new Size(219, 242);
+ panelStorage.TabIndex = 7;
+ //
+ // buttonCollectionDel
+ //
+ buttonCollectionDel.Location = new Point(3, 211);
+ buttonCollectionDel.Name = "buttonCollectionDel";
+ buttonCollectionDel.Size = new Size(213, 23);
+ buttonCollectionDel.TabIndex = 6;
+ buttonCollectionDel.Text = "Удалить коллекцию";
+ buttonCollectionDel.UseVisualStyleBackColor = true;
+ buttonCollectionDel.Click += buttonCollectionDel_Click;
+ //
+ // listBoxCollection
+ //
+ listBoxCollection.FormattingEnabled = true;
+ listBoxCollection.ItemHeight = 15;
+ listBoxCollection.Location = new Point(3, 111);
+ listBoxCollection.Name = "listBoxCollection";
+ listBoxCollection.Size = new Size(213, 94);
+ listBoxCollection.TabIndex = 5;
+ //
+ // buttonCollectionAdd
+ //
+ buttonCollectionAdd.Location = new Point(3, 82);
+ buttonCollectionAdd.Name = "buttonCollectionAdd";
+ buttonCollectionAdd.Size = new Size(213, 23);
+ buttonCollectionAdd.TabIndex = 4;
+ buttonCollectionAdd.Text = "Добавить коллекцию";
+ buttonCollectionAdd.UseVisualStyleBackColor = true;
+ buttonCollectionAdd.Click += buttonCollectionAdd_Click;
+ //
+ // radioButtonList
+ //
+ radioButtonList.AutoSize = true;
+ radioButtonList.Location = new Point(106, 57);
+ radioButtonList.Name = "radioButtonList";
+ radioButtonList.Size = new Size(66, 19);
+ radioButtonList.TabIndex = 3;
+ radioButtonList.TabStop = true;
+ radioButtonList.Text = "Список";
+ radioButtonList.UseVisualStyleBackColor = true;
+ //
+ // radioButtonMassive
+ //
+ radioButtonMassive.AutoSize = true;
+ radioButtonMassive.Location = new Point(33, 57);
+ radioButtonMassive.Name = "radioButtonMassive";
+ radioButtonMassive.Size = new Size(67, 19);
+ radioButtonMassive.TabIndex = 2;
+ radioButtonMassive.TabStop = true;
+ radioButtonMassive.Text = "Массив";
+ radioButtonMassive.UseVisualStyleBackColor = true;
+ //
+ // textBoxCollectionName
+ //
+ textBoxCollectionName.Location = new Point(3, 28);
+ textBoxCollectionName.Name = "textBoxCollectionName";
+ textBoxCollectionName.Size = new Size(213, 23);
+ textBoxCollectionName.TabIndex = 1;
+ //
+ // labelCollectionName
+ //
+ labelCollectionName.AutoSize = true;
+ labelCollectionName.Location = new Point(50, 10);
+ labelCollectionName.Name = "labelCollectionName";
+ labelCollectionName.Size = new Size(122, 15);
+ labelCollectionName.TabIndex = 0;
+ labelCollectionName.Text = "Название коллекции";
+ //
+ // comboBoxSelectorCompany
+ //
+ comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
+ comboBoxSelectorCompany.FormattingEnabled = true;
+ comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
+ comboBoxSelectorCompany.Location = new Point(6, 267);
+ comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+ comboBoxSelectorCompany.Size = new Size(213, 23);
+ comboBoxSelectorCompany.TabIndex = 0;
+ comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged;
+ //
+ // pictureBox
+ //
+ pictureBox.Dock = DockStyle.Fill;
+ pictureBox.Location = new Point(0, 0);
+ pictureBox.Name = "pictureBox";
+ pictureBox.Size = new Size(898, 659);
+ pictureBox.TabIndex = 1;
+ pictureBox.TabStop = false;
+ //
+ // FormStormtrooperCollection
+ //
+ AutoScaleDimensions = new SizeF(7F, 15F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(1123, 659);
+ Controls.Add(pictureBox);
+ Controls.Add(groupBoxTools);
+ Name = "FormStormtrooperCollection";
+ Text = "Коллекция бомбардировщиков";
+ groupBoxTools.ResumeLayout(false);
+ panelCompanyTools.ResumeLayout(false);
+ panelCompanyTools.PerformLayout();
+ panelStorage.ResumeLayout(false);
+ panelStorage.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+ ResumeLayout(false);
+ }
+
+ #endregion
+
+ private GroupBox groupBoxTools;
+ private ComboBox comboBoxSelectorCompany;
+ private Button buttonRemoveStormtrooper;
+ private MaskedTextBox maskedTextBoxPosition;
+ private Button buttonAddStormtrooper;
+ private Button buttonAddBaseStormtrooper;
+ private PictureBox pictureBox;
+ private Button buttonRefresh;
+ private Button buttonGoToCheck;
+ private Panel panelStorage;
+ private RadioButton radioButtonList;
+ private RadioButton radioButtonMassive;
+ private TextBox textBoxCollectionName;
+ private Label labelCollectionName;
+ private Button buttonCreateCompany;
+ private Button buttonCollectionDel;
+ private ListBox listBoxCollection;
+ private Button buttonCollectionAdd;
+ private Panel panelCompanyTools;
+ }
+}
\ No newline at end of file
diff --git a/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.cs b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.cs
new file mode 100644
index 0000000..d4eaaed
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.cs
@@ -0,0 +1,272 @@
+using ProjectStormtrooper.CollectionGenericObjects;
+using ProjectStormtrooper.Drawnings;
+
+namespace ProjectStormtrooper;
+///
+/// Форма работы с компанией и ее коллекцией
+///
+public partial class FormStormtrooperCollection : Form
+{
+ ///
+ /// Хранилище коллекций
+ ///
+ private readonly StorageCollection _storageCollection;
+
+ ///
+ /// Компания
+ ///
+ private AbstractCompany? _company;
+ ///
+ /// Конструктор
+ ///
+ public FormStormtrooperCollection()
+ {
+ InitializeComponent();
+ _storageCollection = new();
+ }
+ ///
+ /// Выбор компании
+ ///
+ ///
+ ///
+ private void comboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ panelCompanyTools.Enabled = true;
+ }
+ ///
+ /// Создание объекта класса-перемещения
+ ///
+ ///
+ private void CreateObject(string type)
+ {
+ if (_company == null)
+ {
+ return;
+ }
+ Random random = new();
+ DrawningBaseStormtrooper drawningBaseStormtrooper;
+ switch (type)
+ {
+ case nameof(DrawningBaseStormtrooper):
+ drawningBaseStormtrooper = new DrawningBaseStormtrooper(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
+ break;
+ case nameof(DrawingStormtrooper):
+ drawningBaseStormtrooper = new DrawingStormtrooper(random.Next(100, 300), random.Next(1000, 3000), GetColor(random), GetColor(random),
+ Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+ break;
+ default:
+ return;
+ }
+ int tempSize = StormtrooperSharingService.getAmountOfObjects();
+ if (_company + drawningBaseStormtrooper != -1)
+ {
+ MessageBox.Show("Объект добавлен");
+ pictureBox.Image = _company.Show();
+ }
+ else
+ {
+ MessageBox.Show("Не удалось добавить объект");
+ }
+ }
+ ///
+ /// Получение цвета
+ ///
+ /// Генератор случайных чисел
+ ///
+ private static Color GetColor(Random random)
+ {
+ Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
+ ColorDialog dialog = new();
+ if (dialog.ShowDialog() == DialogResult.OK)
+ {
+ color = dialog.Color;
+ }
+ return color;
+ }
+ ///
+ /// Добавление бомбардировщика
+ ///
+ ///
+ ///
+ private void buttonAddStormtrooper_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingStormtrooper));
+ ///
+ /// Добавление базового бомбардировщика
+ ///
+ ///
+ ///
+ private void buttonAddBaseStormtrooper_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBaseStormtrooper));
+ ///
+ /// Удаление объекта
+ ///
+ ///
+ ///
+ private void buttonRemoveStormtrooper_Click(object sender, EventArgs e)
+ {
+ if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
+ {
+ return;
+ }
+ if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+ {
+ return;
+ }
+
+ int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+ int tempSize = StormtrooperSharingService.getAmountOfObjects();
+ if (_company - pos != null)
+ {
+ MessageBox.Show("Объект удалён");
+ pictureBox.Image = _company.Show();
+ }
+ else
+ {
+ MessageBox.Show("Не удалось удалить объект");
+ }
+
+ }
+ ///
+ /// Передача объекта в другую форму
+ ///
+ ///
+ ///
+ private void buttonGoToCheck_Click(object sender, EventArgs e)
+ {
+ if (_company == null)
+ {
+ return;
+ }
+ DrawningBaseStormtrooper? stormtrooper = null;
+ int counter = 100;
+ while (stormtrooper == null)
+ {
+ stormtrooper = _company.GetRandomObject();
+ counter--;
+ if (counter < -0)
+ {
+ break;
+ }
+ }
+ if (stormtrooper == null)
+ {
+ return;
+ }
+ FormStormtrooper form = new()
+ {
+ SetStormtrooper = stormtrooper
+ };
+ form.ShowDialog();
+
+ }
+ ///
+ /// Перерисовка коллекции
+ ///
+ ///
+ ///
+ private void buttonRefresh_Click(object sender, EventArgs e)
+ {
+ if (_company == null)
+ {
+ return;
+ }
+ pictureBox.Image = _company.Show();
+ }
+
+ ///
+ /// Добавление коллекции
+ ///
+ ///
+ ///
+ private void buttonCollectionAdd_Click(object sender, EventArgs e)
+ {
+
+ if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
+ {
+ MessageBox.Show("Не все данные заполнены", "Ошибка",
+ MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ CollectionType collectionType = CollectionType.None;
+ if (radioButtonMassive.Checked)
+ {
+ collectionType = CollectionType.Massive;
+ }
+ else if (radioButtonList.Checked)
+ {
+ collectionType = CollectionType.List;
+ }
+ _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+ RerfreshListBoxItems();
+
+ }
+
+ ///
+ /// Удаление коллекции
+ ///
+ ///
+ ///
+ private void buttonCollectionDel_Click(object sender, EventArgs e)
+ {
+ // TODO прописать логику удаления элемента из коллекции
+ // нужно убедиться, что есть выбранная коллекция
+ // спросить у пользователя через MessageBox, что он подтверждает, что хочет удалить запись
+ // удалить и обновить ListBox
+ if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+ {
+ MessageBox.Show("Коллекция не выбрана");
+ return;
+ }
+ if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+ {
+ return;
+ }
+ _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+ RerfreshListBoxItems();
+ }
+
+ ///
+ /// Создание компании
+ ///
+ ///
+ ///
+ private void buttonCreateCompany_Click(object sender, EventArgs e)
+ {
+ if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+ {
+ MessageBox.Show("Коллекция не выбрана");
+ return;
+ }
+ ICollectionGenericObjects? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+ if (collection == null)
+ {
+ MessageBox.Show("Коллекция не проинициализирована");
+ return;
+ }
+ switch (comboBoxSelectorCompany.Text)
+ {
+ case "Хранилище":
+ _company = new StormtrooperSharingService(pictureBox.Width, pictureBox.Height, collection);
+ break;
+ }
+ panelCompanyTools.Enabled = true;
+ RerfreshListBoxItems();
+
+ }
+ ///
+ /// Обновление списка в listBoxCollection
+ ///
+ private void RerfreshListBoxItems()
+ {
+ listBoxCollection.Items.Clear();
+ for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
+ {
+ string? colName = _storageCollection.Keys?[i];
+ if (!string.IsNullOrEmpty(colName))
+ {
+ listBoxCollection.Items.Add(colName);
+ }
+ }
+ }
+}
+
+
+
diff --git a/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.resx b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.resx
new file mode 100644
index 0000000..af32865
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/AbstractStrategy.cs b/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/AbstractStrategy.cs
new file mode 100644
index 0000000..cba80d2
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/AbstractStrategy.cs
@@ -0,0 +1,135 @@
+namespace ProjectStormtrooper.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/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/IMoveableObjects.cs b/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/IMoveableObjects.cs
new file mode 100644
index 0000000..9886158
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/IMoveableObjects.cs
@@ -0,0 +1,24 @@
+namespace ProjectStormtrooper.MovementStrategy;
+
+///
+/// Интерфейс для работы с перемещаемым объектом
+///
+public interface IMoveableObject
+{
+ ///
+ /// Получение координаты объекта
+ ///
+ ObjectParameters? GetObjectPosition { get; }
+
+ ///
+ /// Шаг объекта
+ ///
+ int GetStep { get; }
+
+ ///
+ /// Попытка переместить объект в указанном направлении
+ ///
+ /// Направление
+ /// true - объект перемещен, false - перемещение невозможно
+ bool TryMoveObject(MovementDirection direction);
+}
\ No newline at end of file
diff --git a/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/MoveToBorder.cs b/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/MoveToBorder.cs
new file mode 100644
index 0000000..0e18375
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/MoveToBorder.cs
@@ -0,0 +1,31 @@
+namespace ProjectStormtrooper.MovementStrategy;
+///
+/// Стратегия перемещения объекта в правый нижний угол
+///
+public class MoveToBorder : AbstractStrategy
+{
+ protected override bool IsTargetDestinaion()
+ {
+ ObjectParameters? objParams = GetObjectParameters;
+ if (objParams == null)
+ {
+ return false;
+ }
+ return objParams.LeftBorder - GetStep() <= 0 ||
+ objParams.RightBorder + GetStep() >= FieldWidth ||
+ objParams.TopBorder - GetStep() <= 0
+ || objParams.ObjectMiddleVertical + GetStep() >= FieldHeight;
+ }
+ protected override void MoveToTarget()
+ {
+ ObjectParameters? objParams = GetObjectParameters;
+ if (objParams == null)
+ {
+ return;
+ }
+ int x = objParams.RightBorder;
+ if (x + GetStep() < FieldWidth) MoveRight();
+ int y = objParams.DownBorder;
+ if (y + GetStep() < FieldHeight) MoveDown();
+ }
+}
diff --git a/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/MoveToCenter.cs b/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/MoveToCenter.cs
new file mode 100644
index 0000000..5c06695
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/MoveToCenter.cs
@@ -0,0 +1,52 @@
+using ProjectStormtrooper.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();
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/MoveableStormtrooper.cs b/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/MoveableStormtrooper.cs
new file mode 100644
index 0000000..7c461c3
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/MoveableStormtrooper.cs
@@ -0,0 +1,56 @@
+using ProjectStormtrooper.Drawnings;
+
+namespace ProjectStormtrooper.MovementStrategy;
+///
+/// Класс реализация IMoveableObject с использованием DrawningBaseStormtrooper
+///
+public class MoveableStormtrooper : IMoveableObject
+{
+ private DrawningBaseStormtrooper? _stormtrooper ;
+
+ public MoveableStormtrooper(DrawningBaseStormtrooper stormtrooper)
+ {
+ _stormtrooper = stormtrooper;
+ }
+ public ObjectParameters? GetObjectPosition
+ {
+ get
+ {
+ if( _stormtrooper == null||_stormtrooper.EntityBaseStormtrooper==null || !_stormtrooper.GetPosX.HasValue || !_stormtrooper.GetPosY.HasValue)
+ {
+ return null;
+ }
+ return new ObjectParameters(_stormtrooper.GetPosX.Value, _stormtrooper.GetPosY.Value, _stormtrooper.GetWidth, _stormtrooper.GetHeight);
+ }
+ }
+ public int GetStep =>(int)(_stormtrooper?.EntityBaseStormtrooper?.Step ?? 0);
+
+ public bool TryMoveObject(MovementDirection direction)
+ {
+ if (_stormtrooper == null || _stormtrooper.EntityBaseStormtrooper == null)
+ {
+ return false;
+ }
+
+ return _stormtrooper.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/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/MovementDirection.cs b/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/MovementDirection.cs
new file mode 100644
index 0000000..ca78f1d
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/MovementDirection.cs
@@ -0,0 +1,24 @@
+namespace ProjectStormtrooper.MovementStrategy;
+///
+/// Направление перемещения
+///
+public enum MovementDirection
+{
+ ///
+ /// Вверх
+ ///
+ Up = 1,
+ ///
+ /// Вниз
+ ///
+ Down = 2,
+ ///
+ /// Влево
+ ///
+ Left = 3,
+ ///
+ /// Вправо
+ ///
+ Right = 4
+}
+
diff --git a/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/ObjectParameters.cs b/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/ObjectParameters.cs
new file mode 100644
index 0000000..85dfddf
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/ObjectParameters.cs
@@ -0,0 +1,72 @@
+namespace ProjectStormtrooper.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;
+ }
+}
\ No newline at end of file
diff --git a/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/StrategyStatus.cs b/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/StrategyStatus.cs
new file mode 100644
index 0000000..f4464ec
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/MovementStrategy/StrategyStatus.cs
@@ -0,0 +1,17 @@
+namespace ProjectStormtrooper.MovementStrategy;
+
+public enum StrategyStatus
+{
+ ///
+ /// Все готово к началу
+ ///
+ NotInit,
+ ///
+ /// Выполняется
+ ///
+ InProgress,
+ ///
+ /// Завершено
+ ///
+ Finish
+}
diff --git a/ProjectStormtrooper/ProjectStormtrooper/Program.cs b/ProjectStormtrooper/ProjectStormtrooper/Program.cs
index 763f0aa..41063d3 100644
--- a/ProjectStormtrooper/ProjectStormtrooper/Program.cs
+++ b/ProjectStormtrooper/ProjectStormtrooper/Program.cs
@@ -11,7 +11,7 @@ namespace ProjectStormtrooper
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
- Application.Run(new Form1());
+ Application.Run(new FormStormtrooperCollection());
}
}
}
\ No newline at end of file
diff --git a/ProjectStormtrooper/ProjectStormtrooper/ProjectStormtrooper.csproj b/ProjectStormtrooper/ProjectStormtrooper/ProjectStormtrooper.csproj
index e1a0735..244387d 100644
--- a/ProjectStormtrooper/ProjectStormtrooper/ProjectStormtrooper.csproj
+++ b/ProjectStormtrooper/ProjectStormtrooper/ProjectStormtrooper.csproj
@@ -8,4 +8,19 @@
enable
+
+
+ True
+ True
+ Resources.resx
+
+
+
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+
\ No newline at end of file
diff --git a/ProjectStormtrooper/ProjectStormtrooper/Properties/Resources.Designer.cs b/ProjectStormtrooper/ProjectStormtrooper/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..572fd94
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/Properties/Resources.Designer.cs
@@ -0,0 +1,103 @@
+//------------------------------------------------------------------------------
+//
+// Этот код создан программой.
+// Исполняемая версия:4.0.30319.42000
+//
+// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+// повторной генерации кода.
+//
+//------------------------------------------------------------------------------
+
+namespace ProjectStormtrooper.Properties {
+ using System;
+
+
+ ///
+ /// Класс ресурса со строгой типизацией для поиска локализованных строк и т.д.
+ ///
+ // Этот класс создан автоматически классом StronglyTypedResourceBuilder
+ // с помощью такого средства, как ResGen или Visual Studio.
+ // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen
+ // с параметром /str или перестройте свой проект VS.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
+ }
+
+ ///
+ /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ProjectStormtrooper.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ ///
+ /// Перезаписывает свойство CurrentUICulture текущего потока для всех
+ /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ ///
+ /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap arrowDown {
+ get {
+ object obj = ResourceManager.GetObject("arrowDown", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap arrowLeft {
+ get {
+ object obj = ResourceManager.GetObject("arrowLeft", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap arrowRight {
+ get {
+ object obj = ResourceManager.GetObject("arrowRight", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap arrowUp {
+ get {
+ object obj = ResourceManager.GetObject("arrowUp", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+ }
+}
diff --git a/ProjectStormtrooper/ProjectStormtrooper/Properties/Resources.resx b/ProjectStormtrooper/ProjectStormtrooper/Properties/Resources.resx
new file mode 100644
index 0000000..dc6b4c5
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/Properties/Resources.resx
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+
+ ..\Resources\arrowDown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\arrowLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\arrowRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\arrowUp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
\ No newline at end of file
diff --git a/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowDown.png b/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowDown.png
new file mode 100644
index 0000000..770f129
Binary files /dev/null and b/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowDown.png differ
diff --git a/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowLeft.png b/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowLeft.png
new file mode 100644
index 0000000..98438bc
Binary files /dev/null and b/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowLeft.png differ
diff --git a/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowRight.png b/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowRight.png
new file mode 100644
index 0000000..8878515
Binary files /dev/null and b/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowRight.png differ
diff --git a/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowUp.png b/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowUp.png
new file mode 100644
index 0000000..cd9a278
Binary files /dev/null and b/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowUp.png differ