diff --git a/ProjectStormtrooper/CollectionGenericObjects/AbstractCompany.cs b/ProjectStormtrooper/CollectionGenericObjects/AbstractCompany.cs
new file mode 100644
index 0000000..27ff7f5
--- /dev/null
+++ b/ProjectStormtrooper/CollectionGenericObjects/AbstractCompany.cs
@@ -0,0 +1,102 @@
+using ProjectStormtrooper.Drawnings;
+
+namespace ProjectStormtrooper.CollectionGenericObjects;
+///
+/// Абстракция компании, хранящий коллекцию штурмовика
+///
+public abstract class AbstractCompany
+{
+ ///
+ /// Размер места (ширина)
+ ///
+ protected readonly int _placeSizeWidth = 210;
+ ///
+ /// Размер места (высота)
+ ///
+ protected readonly int _placeSizeHeight = 155;
+ ///
+ /// Ширина окна
+ ///
+ protected readonly int _pictureWidth;
+ ///
+ /// Высота окна
+ ///
+ protected readonly int _pictureHeight;
+ ///
+ /// Коллекция штурмовика
+ ///
+ protected ICollectionGenericObjects? _collection = null;
+ ///
+ /// Вычисление максимального количества элементов, который можно разместить в окне
+ ///
+ 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, DrawningStormtrooperBase stormtrooper)
+ {
+ return company._collection.Insert(stormtrooper);
+ }
+ ///
+ /// Перегрузка оператора удаления для класса
+ ///
+ /// Компания
+ /// Номер удаляемого объекта
+ ///
+ public static DrawningStormtrooperBase operator -(AbstractCompany company, int position)
+ {
+ return company._collection.Remove(position);
+ }
+ ///
+ /// Получение случайного объекта из коллекции
+ ///
+ ///
+ public DrawningStormtrooperBase? 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)
+ {
+ DrawningStormtrooperBase? obj = _collection?.Get(i);
+ obj?.DrawTransport(graphics);
+ }
+ return bitmap;
+ }
+ ///
+ /// Вывод заднего фона
+ ///
+ ///
+ protected abstract void DrawBackgound(Graphics graphics);
+ ///
+ /// Расстановка объектов
+ ///
+ protected abstract void SetObjectsPosition();
+}
diff --git a/ProjectStormtrooper/CollectionGenericObjects/CollectionType.cs b/ProjectStormtrooper/CollectionGenericObjects/CollectionType.cs
new file mode 100644
index 0000000..7b1f089
--- /dev/null
+++ b/ProjectStormtrooper/CollectionGenericObjects/CollectionType.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Tracing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectStormtrooper.CollectionGenericObjects;
+///
+/// Тип коллекции
+///
+public enum CollectionType
+{
+ ///
+ /// Неопределено
+ ///
+ None = 0,
+ ///
+ /// Массив
+ ///
+ Massive = 1,
+ ///
+ /// Список
+ ///
+ List = 2
+
+
+}
diff --git a/ProjectStormtrooper/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectStormtrooper/CollectionGenericObjects/ICollectionGenericObjects.cs
new file mode 100644
index 0000000..46edeb4
--- /dev/null
+++ b/ProjectStormtrooper/CollectionGenericObjects/ICollectionGenericObjects.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+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);
+
+}
diff --git a/ProjectStormtrooper/CollectionGenericObjects/ListGenericObjects.cs b/ProjectStormtrooper/CollectionGenericObjects/ListGenericObjects.cs
new file mode 100644
index 0000000..8887373
--- /dev/null
+++ b/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)
+ {
+ if (position>=0 && position < _collection.Count)
+ {
+ return _collection[position];
+ }
+ return null;
+ }
+
+ public int Insert(T obj)
+ {
+ // TODO проверка, что не превышено максимальное количество элементов
+ // TODO вставка в конец набора
+ if (_collection.Count <= _maxCount)
+ {
+ _collection.Add(obj);
+ return _collection.Count;
+ }
+ return -1;
+ }
+
+ public int Insert(T obj, int position)
+ {
+ // TODO проверка, что не превышено максимальное количество элементов
+ // TODO проверка позиции
+ // TODO вставка по позиции
+ if (position >= 0 && position < _maxCount && _collection.Count <= _maxCount)
+ {
+ _collection.Insert(position, obj);
+ return position;
+ }
+ return -1;
+ }
+
+ public T? Remove(int position)
+ {
+ // TODO проверка позиции
+ // TODO удаление объекта из списка
+ if (position < 0 || position > _maxCount)
+ {
+ return null;
+ }
+ T temp = _collection[position];
+ _collection.RemoveAt(position);
+ return temp;
+ }
+}
diff --git a/ProjectStormtrooper/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectStormtrooper/CollectionGenericObjects/MassiveGenericObjects.cs
new file mode 100644
index 0000000..ab0a3d4
--- /dev/null
+++ b/ProjectStormtrooper/CollectionGenericObjects/MassiveGenericObjects.cs
@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+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)
+ {
+ // проверка позиции
+ 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;
+ }
+}
diff --git a/ProjectStormtrooper/CollectionGenericObjects/StorageCollection.cs b/ProjectStormtrooper/CollectionGenericObjects/StorageCollection.cs
new file mode 100644
index 0000000..302a14e
--- /dev/null
+++ b/ProjectStormtrooper/CollectionGenericObjects/StorageCollection.cs
@@ -0,0 +1,80 @@
+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/CollectionGenericObjects/StormtrooperSharingService.cs b/ProjectStormtrooper/CollectionGenericObjects/StormtrooperSharingService.cs
new file mode 100644
index 0000000..4fed574
--- /dev/null
+++ b/ProjectStormtrooper/CollectionGenericObjects/StormtrooperSharingService.cs
@@ -0,0 +1,66 @@
+using ProjectStormtrooper.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+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/Drawnings/DirectionType.cs b/ProjectStormtrooper/Drawnings/DirectionType.cs
new file mode 100644
index 0000000..5d2dfc9
--- /dev/null
+++ b/ProjectStormtrooper/Drawnings/DirectionType.cs
@@ -0,0 +1,33 @@
+namespace ProjectStormtrooper;
+
+///
+/// Направление перемещения
+///
+public enum DirectionType
+{
+ ///
+ /// Неизвестное направление
+ ///
+ Unknow = -1,
+ ///
+ /// Вверх
+ ///
+ Up = 1,
+ ///
+ /// Вниз
+ ///
+
+ Down = 2,
+ ///
+ /// Влево
+ ///
+
+ Left = 3,
+ ///
+ /// Вправо
+ ///
+
+ Right = 4
+
+
+}
diff --git a/ProjectStormtrooper/Drawnings/DrawingStormtrooper.cs b/ProjectStormtrooper/Drawnings/DrawingStormtrooper.cs
new file mode 100644
index 0000000..9db8277
--- /dev/null
+++ b/ProjectStormtrooper/Drawnings/DrawingStormtrooper.cs
@@ -0,0 +1,66 @@
+using ProjectStormtrooper.Entities;
+
+namespace ProjectStormtrooper.Drawnings;
+///
+/// Класс отвечающий за прорисовку и перемещение объекта-сущности
+///
+public class DrawingStormtrooper: DrawningStormtrooperBase
+{
+
+
+
+
+ ///
+ /// Конструктор
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+
+ public DrawingStormtrooper(int speed,double weight, Color bodyColor,Color additionalColor, bool rockets, bool bombs):base(140,140)
+ {
+ EntityStormtrooperBase = new EntityStormtrooper(speed, weight, bodyColor, additionalColor, rockets, bombs);
+
+
+ }
+
+
+ ///
+ /// Прорисовка объекта
+ ///
+ ///
+ public override void DrawTransport(Graphics g)
+ {
+ if (EntityStormtrooperBase == null || EntityStormtrooperBase is not EntityStormtrooper stormtrooper || !_startPosX.HasValue || !_startPosY.HasValue)
+ {
+ return;
+ }
+
+ Pen pen = new(Color.Black);
+ Brush additionalBrush = new SolidBrush(stormtrooper.AdditionalColor);
+ base.DrawTransport(g);
+ //ракеты штурмовика
+ if (stormtrooper.Rockets)
+ {
+ g.FillRectangle(additionalBrush, _startPosX.Value + 45, _startPosY.Value + 20, 15, 5);
+ g.FillRectangle(additionalBrush, _startPosX.Value + 45, _startPosY.Value + 110, 15, 5);
+ g.DrawRectangle(pen, _startPosX.Value + 45, _startPosY.Value + 20, 15, 5);
+ g.DrawRectangle(pen, _startPosX.Value + 45, _startPosY.Value + 110, 15, 5);
+ }
+ //бомбы штурмовика
+ if (stormtrooper.Bombs)
+ {
+ g.FillRectangle(additionalBrush, _startPosX.Value + 50, _startPosY.Value + 40, 10, 10);
+ g.FillRectangle(additionalBrush, _startPosX.Value + 50, _startPosY.Value + 90, 10, 10);
+ g.DrawRectangle(pen, _startPosX.Value + 50, _startPosY.Value + 40, 10, 10);
+ g.DrawRectangle(pen, _startPosX.Value + 50, _startPosY.Value + 90, 10, 10);
+ }
+
+ }
+
+
+
+}
diff --git a/ProjectStormtrooper/Drawnings/DrawingStormtrooperBase.cs b/ProjectStormtrooper/Drawnings/DrawingStormtrooperBase.cs
new file mode 100644
index 0000000..ee891db
--- /dev/null
+++ b/ProjectStormtrooper/Drawnings/DrawingStormtrooperBase.cs
@@ -0,0 +1,261 @@
+using ProjectStormtrooper.Entities;
+
+namespace ProjectStormtrooper.Drawnings;
+
+public class DrawningStormtrooperBase
+{
+ ///
+ /// Класс-сущность
+ ///
+ public EntityStormtrooperBase? EntityStormtrooperBase { get; protected set; }
+ ///
+ /// Ширина окна
+ ///
+ private int? _pictureWidth;
+ ///
+ /// Высота окна
+ ///
+
+ private int? _pictureHeight;
+ ///
+ /// Левая координата начала прорисовки
+ ///
+
+ protected int? _startPosX;
+ ///
+ /// Верхняя координата начала прорисовки
+ ///
+
+ protected int? _startPosY;
+ ///
+ /// Ширина прорисовки
+ ///
+
+ private readonly int _drawningStormtrooperWidth = 140;
+ ///
+ /// Высота прорисовки
+ ///
+
+ private readonly int _drawningStormtooperHeight = 140;
+
+ ///
+ /// Координата Х объекта
+ ///
+ ///
+ public int? GetPosX => _startPosX;
+ ///
+ /// Координата У объекта
+ ///
+ ///
+
+ public int? GetPosY => _startPosY;
+ ///
+ /// Ширина объекта
+ ///
+ ///
+ public int GetWidth => _drawningStormtrooperWidth;
+ ///
+ /// Высота объекта
+ ///
+ ///
+ public int GetHeight => _drawningStormtooperHeight;
+ ///
+ /// Пустой конструктор
+ ///
+ private DrawningStormtrooperBase()
+ {
+ _pictureHeight = null;
+ _pictureWidth = null;
+ _startPosX = null;
+ _startPosY = null;
+ }
+ ///
+ /// Конструктор
+ ///
+ /// скорость
+ /// вес
+ /// основной цвет
+
+
+ public DrawningStormtrooperBase(int speed, double weight, Color bodyColor):this()
+ {
+ EntityStormtrooperBase = new EntityStormtrooperBase(speed, weight, bodyColor);
+
+ }
+ ///
+ /// Конструктор для наследников
+ ///
+ /// Ширина прорисовки
+ /// Высота прорисовки
+
+ protected DrawningStormtrooperBase(int drawningStormtrooperWidth, int drawningStormtooperHeight) : this()
+ {
+ _drawningStormtrooperWidth = drawningStormtrooperWidth;
+ _drawningStormtooperHeight = drawningStormtooperHeight;
+
+ }
+ ///
+ /// Установка границ поля
+ ///
+ /// Ширина поля
+ /// Высота поля
+ /// true - граница задана, false - проверка не пройдена, нельзя разместить объект в этих размерах
+ public bool SetPictureSize(int width, int height)
+ {
+ if (width >= _drawningStormtrooperWidth || height >= _drawningStormtooperHeight)
+ {
+ _pictureWidth = width;
+ _pictureHeight = height;
+ if (_startPosX != null && _startPosY != null)
+ {
+ SetPosition(_startPosX.Value, _startPosY.Value);
+ }
+ return true;
+
+ }
+ return false;
+ }
+
+ ///
+ /// Установка позиции
+ ///
+ /// Координата Х
+ /// Координата У
+ public void SetPosition(int x, int y)
+ {
+ if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
+ {
+ return;
+ }
+ // TODO если при установке объекта в эти координаты, он будет "выходить" за границы формы
+ // то надо изменить координаты, чтобы он оставался в этих границах
+
+
+ if (x < 0)
+ {
+ x = 0;
+ }
+ else if (x > _pictureWidth - _drawningStormtrooperWidth)
+ {
+ x = _pictureWidth.Value - _drawningStormtrooperWidth;
+ }
+ if (y < 0)
+ {
+ y = 0;
+ }
+ else if (y > _pictureHeight - _drawningStormtooperHeight)
+ {
+ y = _pictureHeight.Value - _drawningStormtooperHeight;
+ }
+
+ _startPosX = x;
+ _startPosY = y;
+ }
+ ///
+ /// Изменение направления перемещения
+ ///
+ /// направление
+ /// true - перемещение выполнено, false - перемещение невозможно
+ public bool MoveTransport(DirectionType direction)
+ {
+ if (EntityStormtrooperBase == null || !_startPosX.HasValue || !_startPosY.HasValue)
+ {
+ return false;
+ }
+ switch (direction)
+ {
+ //влево
+ case DirectionType.Left:
+ if (_startPosX.Value - EntityStormtrooperBase.Step > 0)
+ {
+ _startPosX -= (int)EntityStormtrooperBase.Step;
+ }
+ return true;
+ //Вверх
+ case DirectionType.Up:
+ if (_startPosY.Value - EntityStormtrooperBase.Step > 0)
+ {
+ _startPosY -= (int)EntityStormtrooperBase.Step;
+ }
+ return true;
+
+ //Вправо
+ case DirectionType.Right:
+ if (_startPosX.Value + EntityStormtrooperBase.Step + _drawningStormtrooperWidth < _pictureWidth)
+ {
+ _startPosX += (int)EntityStormtrooperBase.Step;
+ }
+ return true;
+ //Вниз
+ case DirectionType.Down:
+ if (_startPosY.Value + EntityStormtrooperBase.Step + _drawningStormtooperHeight < _pictureHeight)
+ {
+ _startPosY += (int)EntityStormtrooperBase.Step;
+ }
+ return true;
+ default:
+ return false;
+ }
+ }
+
+ ///
+ /// Прорисовка объекта
+ ///
+ ///
+ public virtual void DrawTransport(Graphics g)
+ {
+ if (EntityStormtrooperBase == null || !_startPosX.HasValue || !_startPosY.HasValue)
+ {
+ return;
+ }
+
+ Pen pen = new(Color.Black);
+ Brush bodyColorBrush = new SolidBrush(EntityStormtrooperBase.BodyColor);
+
+
+ //нос штурмовика
+ Brush brBlack = new SolidBrush(Color.Black);
+
+ Point[] Nose = new Point[3];
+ Nose[0].X = _startPosX.Value + 20; Nose[0].Y = _startPosY.Value + 85;
+ Nose[1].X = _startPosX.Value + 20; Nose[1].Y = _startPosY.Value + 65;
+ Nose[2].X = _startPosX.Value; Nose[2].Y = _startPosY.Value + 75;
+ g.FillPolygon(brBlack, Nose);
+ g.DrawPolygon(pen, Nose);
+ //Заднии крылья штурмовика
+
+ Point[] pflybtwings = new Point[6];
+ pflybtwings[0].X = _startPosX.Value + 120; pflybtwings[0].Y = _startPosY.Value + 65;
+ pflybtwings[1].X = _startPosX.Value + 120; pflybtwings[1].Y = _startPosY.Value + 55;
+ pflybtwings[2].X = _startPosX.Value + 140; pflybtwings[2].Y = _startPosY.Value + 35;
+ pflybtwings[3].X = _startPosX.Value + 140; pflybtwings[3].Y = _startPosY.Value + 115;
+ pflybtwings[4].X = _startPosX.Value + 120; pflybtwings[4].Y = _startPosY.Value + 95;
+ pflybtwings[5].X = _startPosX.Value + 120; pflybtwings[5].Y = _startPosY.Value + 85;
+ g.FillPolygon(bodyColorBrush, pflybtwings);
+ g.DrawPolygon(pen, pflybtwings);
+ //Тело штурмовика
+
+ g.FillRectangle(bodyColorBrush, _startPosX.Value + 20, _startPosY.Value + 65, 120, 20);
+ g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 65, 120, 20);
+ //Крылья штурмовика
+
+ Point[] frontwings = new Point[4];
+ frontwings[0].X = _startPosX.Value + 60; frontwings[0].Y = _startPosY.Value + 65;
+ frontwings[1].X = _startPosX.Value + 60; frontwings[1].Y = _startPosY.Value + 5;
+ frontwings[2].X = _startPosX.Value + 70; frontwings[2].Y = _startPosY.Value + 5;
+ frontwings[3].X = _startPosX.Value + 80; frontwings[3].Y = _startPosY.Value + 65;
+ g.FillPolygon(bodyColorBrush, frontwings);
+ g.DrawPolygon(pen, frontwings);
+
+ Point[] frontwings2 = new Point[4];
+ frontwings2[0].X = _startPosX.Value + 60; frontwings2[0].Y = _startPosY.Value + 85;
+ frontwings2[1].X = _startPosX.Value + 60; frontwings2[1].Y = _startPosY.Value + 145;
+ frontwings2[2].X = _startPosX.Value + 70; frontwings2[2].Y = _startPosY.Value + 145;
+ frontwings2[3].X = _startPosX.Value + 80; frontwings2[3].Y = _startPosY.Value + 85;
+ g.FillPolygon(bodyColorBrush, frontwings2);
+ g.DrawPolygon(pen, frontwings2);
+
+
+
+ }
+}
diff --git a/ProjectStormtrooper/Entities/EntityStormtrooper.cs b/ProjectStormtrooper/Entities/EntityStormtrooper.cs
new file mode 100644
index 0000000..003f8cf
--- /dev/null
+++ b/ProjectStormtrooper/Entities/EntityStormtrooper.cs
@@ -0,0 +1,42 @@
+namespace ProjectStormtrooper.Entities;
+
+///
+/// Класс-сущность "Штурмовик"
+///
+public class EntityStormtrooper: EntityStormtrooperBase
+{
+
+ public Color AdditionalColor { get; private set; }
+
+ ///
+ /// Признак (опция) наличия ракет
+ ///
+ public bool Rockets { get; private set; }
+
+ ///
+ /// Признак (опция) наличия бомб
+ ///
+ public bool Bombs { get; private set; }
+
+
+
+ ///
+ /// Инициализация полей объекта-класса штурмовик
+ ///
+ /// Скорость
+ /// Вес
+ /// Основной цвет
+ /// Дополнительный цвет
+ /// Признак наличия ракет
+ /// Признак наличия бомб
+
+ public EntityStormtrooper(int speed, double weight, Color bodyColor, Color additionalColor, bool rockets, bool bombs):base(speed, weight, bodyColor)
+ {
+
+ AdditionalColor = additionalColor;
+ Rockets = rockets;
+ Bombs = bombs;
+
+ }
+}
+
diff --git a/ProjectStormtrooper/Entities/EntityStormtrooperBase.cs b/ProjectStormtrooper/Entities/EntityStormtrooperBase.cs
new file mode 100644
index 0000000..2487091
--- /dev/null
+++ b/ProjectStormtrooper/Entities/EntityStormtrooperBase.cs
@@ -0,0 +1,45 @@
+namespace ProjectStormtrooper.Entities;
+///
+/// Класс-сущность "Штурмовик"
+///
+
+public class EntityStormtrooperBase
+{
+ ///
+ /// Скорость
+ ///
+ 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 EntityStormtrooperBase(int speed, double weight, Color bodyColor)
+ {
+ Speed = speed;
+ Weight = weight;
+ BodyColor = bodyColor;
+
+
+ }
+}
diff --git a/ProjectStormtrooper/Form1.Designer.cs b/ProjectStormtrooper/Form1.Designer.cs
deleted file mode 100644
index dda9405..0000000
--- a/ProjectStormtrooper/Form1.Designer.cs
+++ /dev/null
@@ -1,46 +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()
- {
- SuspendLayout();
- //
- // Form1
- //
- AutoScaleDimensions = new SizeF(8F, 20F);
- AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(800, 450);
- Name = "Form1";
- Text = "Form1";
- Load += Form1_Load;
- ResumeLayout(false);
- }
-
- #endregion
- }
-}
\ No newline at end of file
diff --git a/ProjectStormtrooper/Form1.cs b/ProjectStormtrooper/Form1.cs
deleted file mode 100644
index 80e723a..0000000
--- a/ProjectStormtrooper/Form1.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace ProjectStormtrooper
-{
- public partial class Form1 : Form
- {
- public Form1()
- {
- InitializeComponent();
- }
-
- private void Form1_Load(object sender, EventArgs e)
- {
-
- }
- }
-}
\ No newline at end of file
diff --git a/ProjectStormtrooper/FormStormtrooper.Designer.cs b/ProjectStormtrooper/FormStormtrooper.Designer.cs
new file mode 100644
index 0000000..55d4552
--- /dev/null
+++ b/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()
+ {
+ pictureBoxStormtrooper = new PictureBox();
+ buttonLeft = new Button();
+ buttonUp = new Button();
+ buttonDown = new Button();
+ buttonRight = new Button();
+ comboBoxStrategy = new ComboBox();
+ buttonStrategyStep = new Button();
+ ((System.ComponentModel.ISupportInitialize)pictureBoxStormtrooper).BeginInit();
+ SuspendLayout();
+ //
+ // pictureBoxStormtrooper
+ //
+ pictureBoxStormtrooper.Dock = DockStyle.Fill;
+ pictureBoxStormtrooper.Location = new Point(0, 0);
+ pictureBoxStormtrooper.Name = "pictureBoxStormtrooper";
+ pictureBoxStormtrooper.Size = new Size(925, 597);
+ pictureBoxStormtrooper.TabIndex = 0;
+ pictureBoxStormtrooper.TabStop = false;
+ //
+ // buttonLeft
+ //
+ buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonLeft.BackgroundImage = Properties.Resources.arrow_to_Left;
+ buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
+ buttonLeft.Location = new Point(797, 551);
+ buttonLeft.Name = "buttonLeft";
+ buttonLeft.Size = new Size(35, 35);
+ buttonLeft.TabIndex = 2;
+ buttonLeft.UseVisualStyleBackColor = true;
+ buttonLeft.Click += ButtonMove_Click;
+ //
+ // buttonUp
+ //
+ buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonUp.BackgroundImage = Properties.Resources.arrow_to_Up;
+ buttonUp.BackgroundImageLayout = ImageLayout.Stretch;
+ buttonUp.Location = new Point(838, 509);
+ buttonUp.Name = "buttonUp";
+ buttonUp.Size = new Size(35, 35);
+ buttonUp.TabIndex = 3;
+ buttonUp.UseVisualStyleBackColor = true;
+ buttonUp.Click += ButtonMove_Click;
+ //
+ // buttonDown
+ //
+ buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonDown.BackgroundImage = Properties.Resources.arrow_to_Down;
+ buttonDown.BackgroundImageLayout = ImageLayout.Stretch;
+ buttonDown.Location = new Point(838, 550);
+ buttonDown.Name = "buttonDown";
+ buttonDown.Size = new Size(35, 35);
+ buttonDown.TabIndex = 4;
+ buttonDown.UseVisualStyleBackColor = true;
+ buttonDown.Click += ButtonMove_Click;
+ //
+ // buttonRight
+ //
+ buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonRight.BackgroundImage = Properties.Resources.arrow_to_right;
+ buttonRight.BackgroundImageLayout = ImageLayout.Stretch;
+ buttonRight.Location = new Point(879, 551);
+ buttonRight.Name = "buttonRight";
+ buttonRight.Size = new Size(35, 35);
+ buttonRight.TabIndex = 5;
+ buttonRight.UseVisualStyleBackColor = true;
+ buttonRight.Click += ButtonMove_Click;
+ //
+ // comboBoxStrategy
+ //
+ comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+ comboBoxStrategy.FormattingEnabled = true;
+ comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+ comboBoxStrategy.Location = new Point(792, 8);
+ comboBoxStrategy.Name = "comboBoxStrategy";
+ comboBoxStrategy.Size = new Size(121, 23);
+ comboBoxStrategy.TabIndex = 7;
+ //
+ // buttonStrategyStep
+ //
+ buttonStrategyStep.Location = new Point(839, 37);
+ 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(925, 597);
+ Controls.Add(buttonStrategyStep);
+ Controls.Add(comboBoxStrategy);
+ Controls.Add(buttonRight);
+ Controls.Add(buttonDown);
+ Controls.Add(buttonUp);
+ Controls.Add(buttonLeft);
+ Controls.Add(pictureBoxStormtrooper);
+ Name = "FormStormtrooper";
+ Text = "Штурмовик";
+ ((System.ComponentModel.ISupportInitialize)pictureBoxStormtrooper).EndInit();
+ ResumeLayout(false);
+ }
+
+ #endregion
+
+ private PictureBox pictureBoxStormtrooper;
+ private Button buttonLeft;
+ private Button buttonUp;
+ private Button buttonDown;
+ private Button buttonRight;
+ private ComboBox comboBoxStrategy;
+ private Button buttonStrategyStep;
+ }
+}
\ No newline at end of file
diff --git a/ProjectStormtrooper/FormStormtrooper.cs b/ProjectStormtrooper/FormStormtrooper.cs
new file mode 100644
index 0000000..6963f15
--- /dev/null
+++ b/ProjectStormtrooper/FormStormtrooper.cs
@@ -0,0 +1,128 @@
+using ProjectStormtrooper.Drawnings;
+using ProjectStormtrooper.MovementStrategy;
+
+namespace ProjectStormtrooper;
+///
+/// Форма работы с объектом "Штурмовик"
+///
+public partial class FormStormtrooper : Form
+{///
+/// Поле-объект для прорисовки объекта
+///
+ private DrawningStormtrooperBase? _drawningStormtrooperBase;
+ ///
+ /// Стратегия перемещения
+ ///
+ private AbstractStrategy? _strategy;
+ ///
+ /// Конструктор формы
+ ///
+ public DrawningStormtrooperBase SetStormtrooper
+ {
+ set
+ {
+ _drawningStormtrooperBase = value;
+ _drawningStormtrooperBase.SetPictureSize(pictureBoxStormtrooper.Width, pictureBoxStormtrooper.Height);
+ comboBoxStrategy.Enabled = true;
+ _strategy = null;
+ Draw();
+ }
+ }
+ public FormStormtrooper()
+ {
+ InitializeComponent();
+ _strategy = null;
+ }
+
+ ///
+ /// Метод прорисовки штурмовика
+ ///
+
+ private void Draw()
+ {
+ if (_drawningStormtrooperBase == null)
+ {
+ return;
+ }
+
+ Bitmap bmp = new(pictureBoxStormtrooper.Width, pictureBoxStormtrooper.Height);
+ Graphics gr = Graphics.FromImage(bmp);
+ _drawningStormtrooperBase.DrawTransport(gr);
+ pictureBoxStormtrooper.Image = bmp;
+ }
+
+ ///
+ /// Перемещение объкта по форме(нажатие кнопок навигации)
+ ///
+ ///
+ ///
+ private void ButtonMove_Click(object sender, EventArgs e)
+ {
+ if (_drawningStormtrooperBase == null)
+ {
+ return;
+ }
+
+ string name = ((Button)sender)?.Name ?? string.Empty;
+ bool result = false;
+ switch (name)
+ {
+ case "buttonUp":
+ result = _drawningStormtrooperBase.MoveTransport(DirectionType.Up);
+ break;
+ case "buttonDown":
+ result = _drawningStormtrooperBase.MoveTransport(DirectionType.Down);
+ break;
+ case "buttonLeft":
+ result = _drawningStormtrooperBase.MoveTransport(DirectionType.Left);
+ break;
+ case "buttonRight":
+ result = _drawningStormtrooperBase.MoveTransport(DirectionType.Right);
+ break;
+ }
+
+ if (result)
+ {
+ Draw();
+ }
+
+ }
+
+ private void ButtonStrategyStep_Click(object sender, EventArgs e)
+ {
+ if (_drawningStormtrooperBase == null)
+ {
+ return;
+ }
+
+ if (comboBoxStrategy.Enabled)
+ {
+ _strategy = comboBoxStrategy.SelectedIndex switch
+ {
+ 0 => new MoveToCenter(),
+ 1 => new MoveToBorder(),
+ _ => null,
+ };
+ if (_strategy == null)
+ {
+ return;
+ }
+ _strategy.SetData(new MoveableStormtrooperBase(_drawningStormtrooperBase), 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/Form1.resx b/ProjectStormtrooper/FormStormtrooper.resx
similarity index 100%
rename from ProjectStormtrooper/Form1.resx
rename to ProjectStormtrooper/FormStormtrooper.resx
diff --git a/ProjectStormtrooper/FormStormtrooperCollection.Designer.cs b/ProjectStormtrooper/FormStormtrooperCollection.Designer.cs
new file mode 100644
index 0000000..8537139
--- /dev/null
+++ b/ProjectStormtrooper/FormStormtrooperCollection.Designer.cs
@@ -0,0 +1,302 @@
+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();
+ buttonCreateCompany = 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();
+ buttonRefresh = new Button();
+ buttonGoToCheck = new Button();
+ buttonRemoveStormtrooper = new Button();
+ maskedTextBox = new MaskedTextBox();
+ buttonAddStormtrooper = new Button();
+ buttonAddStormtrooperBase = new Button();
+ comboBoxSelectorCompany = new ComboBox();
+ pictureBox = new PictureBox();
+ panelCompanyTools = new Panel();
+ groupBoxTools.SuspendLayout();
+ panelStorage.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+ panelCompanyTools.SuspendLayout();
+ SuspendLayout();
+ //
+ // groupBoxTools
+ //
+ groupBoxTools.Controls.Add(panelCompanyTools);
+ groupBoxTools.Controls.Add(buttonCreateCompany);
+ groupBoxTools.Controls.Add(panelStorage);
+ groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+ groupBoxTools.Dock = DockStyle.Right;
+ groupBoxTools.Location = new Point(911, 0);
+ groupBoxTools.Name = "groupBoxTools";
+ groupBoxTools.Size = new Size(173, 628);
+ groupBoxTools.TabIndex = 0;
+ groupBoxTools.TabStop = false;
+ groupBoxTools.Text = "Инструменты";
+ //
+ // buttonCreateCompany
+ //
+ buttonCreateCompany.Location = new Point(14, 332);
+ buttonCreateCompany.Name = "buttonCreateCompany";
+ buttonCreateCompany.Size = new Size(150, 23);
+ buttonCreateCompany.TabIndex = 8;
+ buttonCreateCompany.Text = "Создать компанию";
+ buttonCreateCompany.UseVisualStyleBackColor = true;
+ buttonCreateCompany.Click += ButtonCreateCompany_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(167, 278);
+ panelStorage.TabIndex = 7;
+ //
+ // buttonCollectionDel
+ //
+ buttonCollectionDel.Location = new Point(0, 247);
+ buttonCollectionDel.Name = "buttonCollectionDel";
+ buttonCollectionDel.Size = new Size(150, 23);
+ buttonCollectionDel.TabIndex = 6;
+ buttonCollectionDel.Text = "Удалить коллекцию";
+ buttonCollectionDel.UseVisualStyleBackColor = true;
+ buttonCollectionDel.Click += ButtonCollectionDel_Click;
+ //
+ // listBoxCollection
+ //
+ listBoxCollection.FormattingEnabled = true;
+ listBoxCollection.ItemHeight = 15;
+ listBoxCollection.Location = new Point(6, 117);
+ listBoxCollection.Name = "listBoxCollection";
+ listBoxCollection.Size = new Size(144, 124);
+ listBoxCollection.TabIndex = 5;
+ //
+ // buttonCollectionAdd
+ //
+ buttonCollectionAdd.Location = new Point(6, 88);
+ buttonCollectionAdd.Name = "buttonCollectionAdd";
+ buttonCollectionAdd.Size = new Size(150, 23);
+ buttonCollectionAdd.TabIndex = 4;
+ buttonCollectionAdd.Text = "Добавить коллекцию";
+ buttonCollectionAdd.UseVisualStyleBackColor = true;
+ buttonCollectionAdd.Click += ButtonCollectionAdd_Click;
+ //
+ // radioButtonList
+ //
+ radioButtonList.AutoSize = true;
+ radioButtonList.Location = new Point(90, 63);
+ 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(3, 63);
+ 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, 34);
+ textBoxCollectionName.Name = "textBoxCollectionName";
+ textBoxCollectionName.Size = new Size(153, 23);
+ textBoxCollectionName.TabIndex = 1;
+ //
+ // labelCollectionName
+ //
+ labelCollectionName.AutoSize = true;
+ labelCollectionName.Location = new Point(18, 16);
+ labelCollectionName.Name = "labelCollectionName";
+ labelCollectionName.Size = new Size(122, 15);
+ labelCollectionName.TabIndex = 0;
+ labelCollectionName.Text = "Название коллекции";
+ //
+ // buttonRefresh
+ //
+ buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonRefresh.Location = new Point(7, 209);
+ buttonRefresh.Name = "buttonRefresh";
+ buttonRefresh.Size = new Size(155, 32);
+ buttonRefresh.TabIndex = 6;
+ buttonRefresh.Text = "Обновить";
+ buttonRefresh.UseVisualStyleBackColor = true;
+ buttonRefresh.Click += ButtonRefresh_Click;
+ //
+ // buttonGoToCheck
+ //
+ buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonGoToCheck.Location = new Point(7, 167);
+ buttonGoToCheck.Name = "buttonGoToCheck";
+ buttonGoToCheck.Size = new Size(166, 36);
+ buttonGoToCheck.TabIndex = 5;
+ buttonGoToCheck.Text = "Передать на тесты";
+ buttonGoToCheck.UseVisualStyleBackColor = true;
+ buttonGoToCheck.Click += ButtonGoToCheck_Click;
+ //
+ // buttonRemoveStormtrooper
+ //
+ buttonRemoveStormtrooper.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonRemoveStormtrooper.Location = new Point(6, 128);
+ buttonRemoveStormtrooper.Name = "buttonRemoveStormtrooper";
+ buttonRemoveStormtrooper.Size = new Size(166, 33);
+ buttonRemoveStormtrooper.TabIndex = 4;
+ buttonRemoveStormtrooper.Text = "Удалить Штурмовик";
+ buttonRemoveStormtrooper.UseVisualStyleBackColor = true;
+ buttonRemoveStormtrooper.Click += ButtonRemoveStormtrooper_Click;
+ //
+ // maskedTextBox
+ //
+ maskedTextBox.Location = new Point(8, 99);
+ maskedTextBox.Mask = "00";
+ maskedTextBox.Name = "maskedTextBox";
+ maskedTextBox.Size = new Size(153, 23);
+ maskedTextBox.TabIndex = 3;
+ maskedTextBox.ValidatingType = typeof(int);
+
+ //
+ // buttonAddStormtrooper
+ //
+ buttonAddStormtrooper.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonAddStormtrooper.Location = new Point(7, 48);
+ buttonAddStormtrooper.Name = "buttonAddStormtrooper";
+ buttonAddStormtrooper.Size = new Size(155, 45);
+ buttonAddStormtrooper.TabIndex = 2;
+ buttonAddStormtrooper.Text = "Добавление Штурмовика";
+ buttonAddStormtrooper.UseVisualStyleBackColor = true;
+ buttonAddStormtrooper.Click += ButtonAddStormtrooper_Click;
+ //
+ // buttonAddStormtrooperBase
+ //
+ buttonAddStormtrooperBase.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonAddStormtrooperBase.Location = new Point(6, 3);
+ buttonAddStormtrooperBase.Name = "buttonAddStormtrooperBase";
+ buttonAddStormtrooperBase.Size = new Size(154, 39);
+ buttonAddStormtrooperBase.TabIndex = 1;
+ buttonAddStormtrooperBase.Text = "Добавление базового Штурмовика";
+ buttonAddStormtrooperBase.UseVisualStyleBackColor = true;
+ buttonAddStormtrooperBase.Click += ButtonAddStormtrooperBase_Click;
+ //
+ // 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, 303);
+ comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+ comboBoxSelectorCompany.Size = new Size(161, 23);
+ comboBoxSelectorCompany.TabIndex = 0;
+ comboBoxSelectorCompany.SelectedIndexChanged += СomboBoxSelectorCompany_SelectedIndexChanged;
+ //
+ // pictureBox
+ //
+ pictureBox.Dock = DockStyle.Fill;
+ pictureBox.Location = new Point(0, 0);
+ pictureBox.Name = "pictureBox";
+ pictureBox.Size = new Size(911, 628);
+ pictureBox.TabIndex = 3;
+ pictureBox.TabStop = false;
+ //
+ // panelCompanyTools
+ //
+ panelCompanyTools.Controls.Add(buttonAddStormtrooperBase);
+ panelCompanyTools.Controls.Add(buttonAddStormtrooper);
+ panelCompanyTools.Controls.Add(maskedTextBox);
+ panelCompanyTools.Controls.Add(buttonRefresh);
+ panelCompanyTools.Controls.Add(buttonRemoveStormtrooper);
+ panelCompanyTools.Controls.Add(buttonGoToCheck);
+ panelCompanyTools.Enabled = false;
+ panelCompanyTools.Location = new Point(6, 361);
+ panelCompanyTools.Name = "panelCompanyTools";
+ panelCompanyTools.Size = new Size(161, 261);
+ panelCompanyTools.TabIndex = 7;
+ //
+ // FormStormtrooperCollection
+ //
+ AutoScaleDimensions = new SizeF(7F, 15F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(1084, 628);
+ Controls.Add(pictureBox);
+ Controls.Add(groupBoxTools);
+ Name = "FormStormtrooperCollection";
+ Text = "Коллекция штурмовиков";
+ groupBoxTools.ResumeLayout(false);
+ panelStorage.ResumeLayout(false);
+ panelStorage.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+ panelCompanyTools.ResumeLayout(false);
+ panelCompanyTools.PerformLayout();
+ ResumeLayout(false);
+ }
+
+ #endregion
+
+ private GroupBox groupBoxTools;
+ private Button buttonAddStormtrooperBase;
+ private ComboBox comboBoxSelectorCompany;
+ private Button buttonAddStormtrooper;
+ private PictureBox pictureBox;
+ private Button buttonRemoveStormtrooper;
+ private MaskedTextBox maskedTextBox;
+ private Button buttonGoToCheck;
+ private Button buttonRefresh;
+ private Panel panelStorage;
+ private TextBox textBoxCollectionName;
+ private Label labelCollectionName;
+ private ListBox listBoxCollection;
+ private Button buttonCollectionAdd;
+ private RadioButton radioButtonList;
+ private RadioButton radioButtonMassive;
+ private Button buttonCreateCompany;
+ private Button buttonCollectionDel;
+ private Panel panelCompanyTools;
+ }
+}
\ No newline at end of file
diff --git a/ProjectStormtrooper/FormStormtrooperCollection.cs b/ProjectStormtrooper/FormStormtrooperCollection.cs
new file mode 100644
index 0000000..cea0b4c
--- /dev/null
+++ b/ProjectStormtrooper/FormStormtrooperCollection.cs
@@ -0,0 +1,282 @@
+using ProjectStormtrooper.CollectionGenericObjects;
+using ProjectStormtrooper.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ProjectStormtrooper;
+///
+/// Форма работы с компанией и ее коллекцией
+///
+
+public partial class FormStormtrooperCollection : Form
+{
+ ///
+ /// Хранилище коллекций
+ ///
+ private readonly StorageCollection _storageCollection;
+ ///
+ /// Компания
+ ///
+ private AbstractCompany? _company = null;
+ ///
+ /// Конструктор
+ ///
+ public FormStormtrooperCollection()
+ {
+ InitializeComponent();
+ _storageCollection = new();
+ }
+
+
+ ///
+ /// Выбор компании
+ ///
+ ///
+ ///
+ private void СomboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ panelCompanyTools.Enabled = true;
+ }
+ ///
+ /// Создание объекта класса-перемещения
+ ///
+ ///
+ private void CreateObject(string type)
+ {
+ if (_company == null)
+ {
+ return;
+ }
+ Random random = new();
+ DrawningStormtrooperBase drawningStormtrooperBase;
+ switch (type)
+ {
+ case nameof(DrawingStormtrooper):
+ drawningStormtrooperBase = 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;
+ case nameof(DrawningStormtrooperBase):
+ drawningStormtrooperBase = new DrawningStormtrooperBase(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
+ break;
+ default:
+ return;
+
+ }
+ if (_company + drawningStormtrooperBase != -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 ButtonAddStormtrooperBase_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningStormtrooperBase));
+ ///
+ /// Добавление штурмовика
+ ///
+ ///
+ ///
+ private void ButtonAddStormtrooper_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingStormtrooper));
+ ///
+ /// Удаление объекта
+ ///
+ ///
+ ///
+ private void ButtonRemoveStormtrooper_Click(object sender, EventArgs e)
+ {
+ if (_company == null)
+ {
+ return;
+ }
+ if (string.IsNullOrEmpty(maskedTextBox.Text) || _company == null)
+ {
+ return;
+ }
+ if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+ {
+ return;
+ }
+ int pos = Convert.ToInt32(maskedTextBox.Text);
+ 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;
+ }
+ DrawningStormtrooperBase? 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 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.Yes)
+ {
+ return;
+ }
+ _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+ 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);
+ }
+ }
+ }
+ ///
+ /// Создание компании
+ ///
+ ///
+ ///
+ 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();
+
+ }
+
+
+}
diff --git a/ProjectStormtrooper/FormStormtrooperCollection.resx b/ProjectStormtrooper/FormStormtrooperCollection.resx
new file mode 100644
index 0000000..af32865
--- /dev/null
+++ b/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/MovementStrategy/AbstractStrategy.cs b/ProjectStormtrooper/MovementStrategy/AbstractStrategy.cs
new file mode 100644
index 0000000..c29ecca
--- /dev/null
+++ b/ProjectStormtrooper/MovementStrategy/AbstractStrategy.cs
@@ -0,0 +1,120 @@
+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 moveableObjects,int width, int height)
+ {
+ if (moveableObjects == null)
+ {
+ _state = StrategyStatus.NotInit;
+ return;
+ }
+ _state = StrategyStatus.InProgress;
+ _moveableObject = moveableObjects;
+ FieldWidth = width;
+ FieldHeight = height;
+
+ }
+ public void MakeStep()
+ {
+ if (_state != StrategyStatus.InProgress)
+ {
+ return;
+ }
+ if (IsTargetDestinaion())
+ {
+ _state = StrategyStatus.Finish;
+ return;
+ }
+ MoveToTarget();
+ }
+ ///
+ /// Перемещение влево
+ ///
+ /// Результат перемещения ( true - удалось переместиться, false - неудача)
+ protected bool MoveLeft() => MoveTo(MovementDirection.Left);
+ ///
+ /// Перемещение вправо
+ ///
+ /// Результат перемещения ( true - удалось переместиться, false - неудача)
+ protected bool MoveRight() => MoveTo(MovementDirection.Right);
+ ///
+ /// Перемещение вверх
+ ///
+ /// Результат перемещения ( true - удалось переместиться, false - неудача)
+ protected bool MoveUp() => MoveTo(MovementDirection.Up);
+ ///
+ /// Перемещение вниз
+ ///
+ /// Результат перемещения ( true - удалось переместиться, false - неудача)
+ protected bool MoveDown() => MoveTo(MovementDirection.Down);
+ ///
+ /// Параметры объекта
+ ///
+ protected ObjectParameters? GetObjectParameters => _moveableObject?.GetObjectPosition;
+ ///
+ /// Шаг объекта
+ ///
+ ///
+ protected int? GetStep()
+ {
+ if (_state != StrategyStatus.InProgress)
+ {
+ return null;
+ }
+ return _moveableObject?.GetStep;
+ }
+ ///
+ /// Перемещение к цели
+ ///
+ protected abstract void MoveToTarget();
+ ///
+ /// Достигнута ли цель
+ ///
+ ///
+ protected abstract bool IsTargetDestinaion();
+ ///
+ /// Попытка перемещения в требуемомо направлении
+ ///
+ /// направление
+ /// Результат перемещения ( true - удалось переместиться, false - неудача)
+ private bool MoveTo(MovementDirection movementDirection)
+ {
+ if (_state!= StrategyStatus.InProgress)
+ {
+ return false;
+ }
+ return _moveableObject?.TryMoveObject(movementDirection) ?? false;
+ }
+
+
+}
diff --git a/ProjectStormtrooper/MovementStrategy/IMoveableObjects.cs b/ProjectStormtrooper/MovementStrategy/IMoveableObjects.cs
new file mode 100644
index 0000000..8906846
--- /dev/null
+++ b/ProjectStormtrooper/MovementStrategy/IMoveableObjects.cs
@@ -0,0 +1,21 @@
+namespace ProjectStormtrooper.MovementStrategy;
+///
+/// Интерфейс для работы с перемещаемым объектом
+///
+public interface IMoveableObject
+{
+ ///
+ /// Получение координат объекта
+ ///
+ ObjectParameters? GetObjectPosition { get; }
+ ///
+ /// Шаг объекта
+ ///
+ int GetStep { get; }
+ ///
+ /// Попытка переместить объект в указанном направлении
+ ///
+ ///
+ ///
+ bool TryMoveObject(MovementDirection direction);
+}
diff --git a/ProjectStormtrooper/MovementStrategy/MoveToBorder.cs b/ProjectStormtrooper/MovementStrategy/MoveToBorder.cs
new file mode 100644
index 0000000..2c35822
--- /dev/null
+++ b/ProjectStormtrooper/MovementStrategy/MoveToBorder.cs
@@ -0,0 +1,28 @@
+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/MovementStrategy/MoveToCenter.cs b/ProjectStormtrooper/MovementStrategy/MoveToCenter.cs
new file mode 100644
index 0000000..ce16452
--- /dev/null
+++ b/ProjectStormtrooper/MovementStrategy/MoveToCenter.cs
@@ -0,0 +1,52 @@
+namespace 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/MovementStrategy/MoveableStormtrooperBase.cs b/ProjectStormtrooper/MovementStrategy/MoveableStormtrooperBase.cs
new file mode 100644
index 0000000..8dfb492
--- /dev/null
+++ b/ProjectStormtrooper/MovementStrategy/MoveableStormtrooperBase.cs
@@ -0,0 +1,60 @@
+using ProjectStormtrooper.Drawnings;
+
+namespace ProjectStormtrooper.MovementStrategy;
+///
+/// Класс-реализации IMoveableObject с использованием DrawingStormtrooperBase
+///
+public class MoveableStormtrooperBase : IMoveableObject
+{
+ ///
+ /// Поле-объект класса DrawningStormtrooperBase или его наследников
+ ///
+ private readonly DrawningStormtrooperBase? _stormtrooper = null;
+ ///
+ /// Конструктор
+ ///
+ /// Объект класса DrawningStormtrooperBase
+ public MoveableStormtrooperBase(DrawningStormtrooperBase Stormtrooper)
+ {
+ _stormtrooper = Stormtrooper;
+ }
+ public ObjectParameters? GetObjectPosition
+ {
+ get
+ {
+ if (_stormtrooper == null || _stormtrooper.EntityStormtrooperBase == 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?.EntityStormtrooperBase?.Step ?? 0);
+
+ public bool TryMoveObject(MovementDirection direction)
+ {
+ if (_stormtrooper == null || _stormtrooper.EntityStormtrooperBase == 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/MovementStrategy/MovementDirection.cs b/ProjectStormtrooper/MovementStrategy/MovementDirection.cs
new file mode 100644
index 0000000..f043020
--- /dev/null
+++ b/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/MovementStrategy/ObjectParameters.cs b/ProjectStormtrooper/MovementStrategy/ObjectParameters.cs
new file mode 100644
index 0000000..ede43be
--- /dev/null
+++ b/ProjectStormtrooper/MovementStrategy/ObjectParameters.cs
@@ -0,0 +1,61 @@
+namespace ProjectStormtrooper.MovementStrategy;
+///
+/// Параметры-координаты объекта
+///
+public class ObjectParameters
+{
+ ///
+ /// Координатва х
+ ///
+ private readonly int _x;
+ ///
+ /// Координатва у
+ ///
+ private readonly int _y;
+ ///
+ /// Ширина объекта
+ ///
+ private readonly int _width;
+ ///
+ /// Высота объекта
+ ///
+ private readonly int _height;
+ ///
+ /// Левая граница
+ ///
+ public int LeftBorder => _x;
+ ///
+ /// Верхняя граница
+ ///
+ public int TopBorder => _y;
+ ///
+ /// Правая граница
+ ///
+ public int RightBorder => _x + _width;
+ ///
+ /// Нижняя граница
+ ///
+ public int DownBorder => _y + _height;
+ ///
+ /// Середина объекта
+ ///
+ public int ObjectMiddleHorizontal => _x + _width / 2;
+ ///
+ /// Середина объекта
+ ///
+ public int ObjectMiddleVertical => _y + _height / 2;
+ ///
+ /// Конструктор
+ ///
+ /// Координата х
+ /// Координа у
+ /// Ширина объекта
+ /// Высота объекта
+ public ObjectParameters(int x, int y, int width, int height)
+ {
+ _x = x;
+ _y = y;
+ _width = width;
+ _height = height;
+ }
+}
diff --git a/ProjectStormtrooper/MovementStrategy/StrategyStatus.cs b/ProjectStormtrooper/MovementStrategy/StrategyStatus.cs
new file mode 100644
index 0000000..796cb9a
--- /dev/null
+++ b/ProjectStormtrooper/MovementStrategy/StrategyStatus.cs
@@ -0,0 +1,19 @@
+namespace ProjectStormtrooper.MovementStrategy;
+///
+/// Статус выполнения операции перемещения
+///
+public enum StrategyStatus
+{
+ ///
+ /// Все готово к началу
+ ///
+ NotInit,
+ ///
+ /// Выполняется
+ ///
+ InProgress,
+ ///
+ /// Завершено
+ ///
+ Finish
+}
diff --git a/ProjectStormtrooper/Program.cs b/ProjectStormtrooper/Program.cs
index 763f0aa..41063d3 100644
--- a/ProjectStormtrooper/Program.cs
+++ b/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.csproj b/ProjectStormtrooper/ProjectStormtrooper.csproj
index e1a0735..244387d 100644
--- a/ProjectStormtrooper/ProjectStormtrooper.csproj
+++ b/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/Properties/Resources.Designer.cs b/ProjectStormtrooper/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..f1e7f67
--- /dev/null
+++ b/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 arrow_to_Down {
+ get {
+ object obj = ResourceManager.GetObject("arrow-to-Down", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap arrow_to_Left {
+ get {
+ object obj = ResourceManager.GetObject("arrow-to-Left", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap arrow_to_right {
+ get {
+ object obj = ResourceManager.GetObject("arrow-to-right", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap arrow_to_Up {
+ get {
+ object obj = ResourceManager.GetObject("arrow-to-Up", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+ }
+}
diff --git a/ProjectStormtrooper/Properties/Resources.resx b/ProjectStormtrooper/Properties/Resources.resx
new file mode 100644
index 0000000..ea850ce
--- /dev/null
+++ b/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\arrow-to-Down.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\arrow-to-Left.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\arrow-to-right.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\arrow-to-Up.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
\ No newline at end of file
diff --git a/ProjectStormtrooper/Resources/arrow-to-Down.jpg b/ProjectStormtrooper/Resources/arrow-to-Down.jpg
new file mode 100644
index 0000000..1af961a
Binary files /dev/null and b/ProjectStormtrooper/Resources/arrow-to-Down.jpg differ
diff --git a/ProjectStormtrooper/Resources/arrow-to-Left.jpg b/ProjectStormtrooper/Resources/arrow-to-Left.jpg
new file mode 100644
index 0000000..4ce79af
Binary files /dev/null and b/ProjectStormtrooper/Resources/arrow-to-Left.jpg differ
diff --git a/ProjectStormtrooper/Resources/arrow-to-Up.jpg b/ProjectStormtrooper/Resources/arrow-to-Up.jpg
new file mode 100644
index 0000000..4c69df2
Binary files /dev/null and b/ProjectStormtrooper/Resources/arrow-to-Up.jpg differ
diff --git a/ProjectStormtrooper/Resources/arrow-to-right.jpg b/ProjectStormtrooper/Resources/arrow-to-right.jpg
new file mode 100644
index 0000000..7b355cd
Binary files /dev/null and b/ProjectStormtrooper/Resources/arrow-to-right.jpg differ