ikswi/ISEbd-12_Paramonova_I.A._Simple
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

4 лабораторная работа

Browse Source
This commit is contained in:
ikswi 2024-03-30 05:03:10 +04:00
parent 9654506023
commit 1f06635803
14 changed files with 552 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
AirFighter/AirFighter/CollectionGenericObjects/AbstractCompany.cs
View File

@ -30,7 +30,7 @@ public abstract class AbstractCompany
/// <summary> /// <summary>
/// Коллекция автомобилей /// Коллекция автомобилей
/// </summary> /// </summary>
protected ICollectionGenericObjects<DrawningPlane>? _collection = null; protected ICollectionGenericObjects<DrawningMilitaryAircraft>? _collection = null;
/// <summary> /// <summary>
/// Вычисление максимального количества элементов, который можно разместить в окне /// Вычисление максимального количества элементов, который можно разместить в окне
@ -43,7 +43,7 @@ public abstract class AbstractCompany
/// <param name="picWidth">Ширина окна</param> /// <param name="picWidth">Ширина окна</param>
/// <param name="picHeight">Высота окна</param> /// <param name="picHeight">Высота окна</param>
/// <param name="collection">Коллекция автомобилей</param> /// <param name="collection">Коллекция автомобилей</param>
public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningPlane> collection) public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningMilitaryAircraft> collection)
{ {
_pictureWidth = picWidth; _pictureWidth = picWidth;
_pictureHeight = picHeight; _pictureHeight = picHeight;
@ -57,7 +57,7 @@ public abstract class AbstractCompany
/// <param name="company">Компания</param> /// <param name="company">Компания</param>
/// <param name="plane">Добавляемый объект</param> /// <param name="plane">Добавляемый объект</param>
/// <returns></returns> /// <returns></returns>
public static int operator +(AbstractCompany company, DrawningPlane plane) public static int operator +(AbstractCompany company, DrawningMilitaryAircraft plane)
{ {
return company._collection.Insert(plane); return company._collection.Insert(plane);
} }
@ -68,7 +68,7 @@ public abstract class AbstractCompany
/// <param name="company">Компания</param> /// <param name="company">Компания</param>
/// <param name="position">Номер удаляемого объекта</param> /// <param name="position">Номер удаляемого объекта</param>
/// <returns></returns> /// <returns></returns>
public static DrawningPlane operator -(AbstractCompany company, int position) public static DrawningMilitaryAircraft operator -(AbstractCompany company, int position)
{ {
return company._collection.Remove(position); return company._collection.Remove(position);
} }
@ -77,7 +77,7 @@ public abstract class AbstractCompany
/// Получение случайного объекта из коллекции /// Получение случайного объекта из коллекции
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public DrawningPlane? GetRandomObject() public DrawningMilitaryAircraft? GetRandomObject()
{ {
Random rnd = new(); Random rnd = new();
return _collection?.Get(rnd.Next(GetMaxCount)); return _collection?.Get(rnd.Next(GetMaxCount));
@ -96,7 +96,7 @@ public abstract class AbstractCompany
SetObjectsPosition(); SetObjectsPosition();
for (int i = 0; i < (_collection?.Count ?? 0); ++i) for (int i = 0; i < (_collection?.Count ?? 0); ++i)
{ {
DrawningPlane? obj = _collection?.Get(i); DrawningMilitaryAircraft? obj = _collection?.Get(i);
obj?.DrawTransport(graphics); obj?.DrawTransport(graphics);
} }

2
AirFighter/AirFighter/CollectionGenericObjects/Angar.cs
View File

@ -13,7 +13,7 @@ public class Angar : AbstractCompany
/// <param name="picWidth"></param> /// <param name="picWidth"></param>
/// <param name="picHeight"></param> /// <param name="picHeight"></param>
/// <param name="collection"></param> /// <param name="collection"></param>
public Angar(int picWidth, int picHeight, ICollectionGenericObjects<DrawningPlane> collection) : base(picWidth, picHeight, collection) public Angar(int picWidth, int picHeight, ICollectionGenericObjects<DrawningMilitaryAircraft> collection) : base(picWidth, picHeight, collection)
{ {
} }

22
AirFighter/AirFighter/CollectionGenericObjects/CollectionType.cs Normal file
View File

@ -0,0 +1,22 @@
namespace ProjectAirFighter.CollectionGenericObjects;
/// <summary>
/// Тип коллекции
/// </summary>
public enum CollectionType
{
/// <summary>
/// Неопределено
/// </summary>
None = 0,
/// <summary>
/// Массив
/// </summary>
Massive = 1,
/// <summary>
/// Список
/// </summary>
List = 2
}

68
AirFighter/AirFighter/CollectionGenericObjects/ListGenericObjects.cs Normal file
View File

@ -0,0 +1,68 @@
namespace ProjectAirFighter.CollectionGenericObjects;
/// <summary>
/// Параметризованный набор объектов
/// </summary>
/// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
public class ListGenericObjects<T> : ICollectionGenericObjects<T>
where T : class
{
/// <summary>
/// Список объектов, которые храним
/// </summary>
private readonly List<T?> _collection;
/// <summary>
/// Максимально допустимое число объектов в списке
/// </summary>
private int _maxCount;
public int Count => _collection.Count;
public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
/// <summary>
/// Конструктор
/// </summary>
public ListGenericObjects()
{
_collection = new();
}
public T? Get(int position)
{
// TODO проверка позиции
if (position >= Count || position < 0) return null;
return _collection[position];
}
public int Insert(T obj)
{
// TODO проверка, что не превышено максимальное количество элементов
// TODO вставка в конец набора
if (Count + 1 > _maxCount) return -1;
_collection.Add(obj);
return Count;
}
public int Insert(T obj, int position)
{
// TODO проверка, что не превышено максимальное количество элементов
// TODO проверка позиции
// TODO вставка по позиции
if (Count + 1 > _maxCount) return -1;
if (position < 0 || position > Count) return -1;
_collection.Insert(position, obj);
return 1;
}
public T? Remove(int position)
{
// TODO проверка позиции
// TODO удаление объекта из списка
if (position < 0 || position > Count) return null;
T? pos = _collection[position];
_collection.RemoveAt(position);
return pos;
}
}

77
AirFighter/AirFighter/CollectionGenericObjects/StorageCollection.cs Normal file
View File

@ -0,0 +1,77 @@
namespace ProjectAirFighter.CollectionGenericObjects;
/// <summary>
/// Класс-хранилище коллекций
/// </summary>
/// <typeparam name="T"></typeparam>
public class StorageCollection<T>
where T : class
{
/// <summary>
/// Словарь (хранилище) с коллекциями
/// </summary>
readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
/// <summary>
/// Возвращение списка названий коллекций
/// </summary>
public List<string> Keys => _storages.Keys.ToList();
/// <summary>
/// Конструктор
/// </summary>
public StorageCollection()
{
_storages = new Dictionary<string, ICollectionGenericObjects<T>>();
}
/// <summary>
/// Добавление коллекции в хранилище
/// </summary>
/// <param name="name">Название коллекции</param>
/// <param name="collectionType">тип коллекции</param>
public void AddCollection(string name, CollectionType collectionType)
{
// TODO проверка, что name не пустой и нет в словаре записи с таким ключом
// TODO Прописать логику для добавления
if (name == null || _storages.ContainsKey(name)) { return; }
switch (collectionType)
{
case CollectionType.None:
return;
case CollectionType.Massive:
_storages[name] = new MassiveGenericObjects<T>();
return;
case CollectionType.List:
_storages[name] = new ListGenericObjects<T>();
return;
}
}
/// <summary>
/// Удаление коллекции
/// </summary>
/// <param name="name">Название коллекции</param>
public void DelCollection(string name)
{
// TODO Прописать логику для удаления коллекции
if (_storages.ContainsKey(name))
_storages.Remove(name);
}
/// <summary>
/// Доступ к коллекции
/// </summary>
/// <param name="name">Название коллекции</param>
/// <returns></returns>
public ICollectionGenericObjects<T>? this[string name]
{
get
{
// TODO Продумать логику получения объекта
if (name == null || !_storages.ContainsKey(name)) { return null; }
return _storages[name];
}
}
}

6
AirFighter/AirFighter/Drawnings/DrawningAirFighter.cs
View File

@ -5,7 +5,7 @@ namespace ProjectAirFighter.Drawnings;
/// <summary> /// <summary>
/// Класс, отвечающий за прорисовку и перемещение объекта-сущности /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
/// </summary> /// </summary>
public class DrawningAirFighter : DrawningPlane public class DrawningAirFighter : DrawningMilitaryAircraft
{ {
/// <summary> /// <summary>
@ -19,12 +19,12 @@ public class DrawningAirFighter : DrawningPlane
/// <param name="rockets">Признак наличия ракет</param> /// <param name="rockets">Признак наличия ракет</param>
public DrawningAirFighter (int speed, double weight, Color bodyColor, Color additionalColor, bool wings, bool rockets) : base (70, 70) public DrawningAirFighter (int speed, double weight, Color bodyColor, Color additionalColor, bool wings, bool rockets) : base (70, 70)
{ {
EntityPlane = new EntityAirFighter(speed, weight, bodyColor, additionalColor, wings, rockets); EntityMilitaryAircraft = new EntityAirFighter(speed, weight, bodyColor, additionalColor, wings, rockets);
} }
public override void DrawTransport(Graphics g) public override void DrawTransport(Graphics g)
{ {
if (EntityPlane == null || EntityPlane is not EntityAirFighter planeFighter || !_startPosX.HasValue || !_startPosY.HasValue) if (EntityMilitaryAircraft == null || EntityMilitaryAircraft is not EntityAirFighter planeFighter || !_startPosX.HasValue || !_startPosY.HasValue)
{ {
return; return;
} }

56
AirFighter/AirFighter/Drawnings/DrawningPlane.cs → AirFighter/AirFighter/Drawnings/DrawningMilitaryAircraft.cs
View File

@ -5,12 +5,12 @@ namespace ProjectAirFighter.Drawnings;
/// <summary> /// <summary>
/// Класс, отвечающий за прорисовку и перемещение базового объекта-сущности /// Класс, отвечающий за прорисовку и перемещение базового объекта-сущности
/// </summary> /// </summary>
public class DrawningPlane public class DrawningMilitaryAircraft
{ {
/// <summary> /// <summary>
/// Класс-сущность /// Класс-сущность
/// </summary> /// </summary>
public EntityPlane? EntityPlane { get; protected set; } public EntityMilitaryAircraft? EntityMilitaryAircraft { get; protected set; }
/// <summary> /// <summary>
/// Ширина окна /// Ширина окна
@ -35,12 +35,12 @@ public class DrawningPlane
/// <summary> /// <summary>
/// Ширина прорисовки самолёта /// Ширина прорисовки самолёта
/// </summary> /// </summary>
private readonly int _drawningFighterWidth = 70; private readonly int _drawningMilitaryAircraftWidth = 70;
/// <summary> /// <summary>
/// Высота прорисовки самолёта /// Высота прорисовки самолёта
/// </summary> /// </summary>
private readonly int _drawningFighterHeight = 70; private readonly int _drawningMilitaryAircraftHeight = 70;
/// <summary> /// <summary>
/// Координата X объекта /// Координата X объекта
@ -55,17 +55,17 @@ public class DrawningPlane
/// <summary> /// <summary>
/// Ширина объекта /// Ширина объекта
/// </summary> /// </summary>
public int GetWidth => _drawningFighterWidth; public int GetWidth => _drawningMilitaryAircraftWidth;
/// <summary> /// <summary>
/// Высота объекта /// Высота объекта
/// </summary> /// </summary>
public int GetHeight => _drawningFighterHeight; public int GetHeight => _drawningMilitaryAircraftHeight;
/// <summary> /// <summary>
/// Пустой конструктор /// Пустой конструктор
/// </summary> /// </summary>
private DrawningPlane() private DrawningMilitaryAircraft()
{ {
_pictureWidth = null; _pictureWidth = null;
_pictureHeight = null; _pictureHeight = null;
@ -79,9 +79,9 @@ public class DrawningPlane
/// <param name="speed">Скорость</param> /// <param name="speed">Скорость</param>
/// <param name="weight">Вес</param> /// <param name="weight">Вес</param>
/// <param name="bodyColor">Основной цвет</param> /// <param name="bodyColor">Основной цвет</param>
public DrawningPlane (int speed, double weight, Color bodyColor) : this() public DrawningMilitaryAircraft (int speed, double weight, Color bodyColor) : this()
{ {
EntityPlane = new EntityPlane(speed, weight, bodyColor); EntityMilitaryAircraft = new EntityMilitaryAircraft(speed, weight, bodyColor);
} }
/// <summary> /// <summary>
@ -89,15 +89,15 @@ public class DrawningPlane
/// </summary> /// </summary>
/// <param name="drawningCarWidth">Ширина прорисовки самолёта</param> /// <param name="drawningCarWidth">Ширина прорисовки самолёта</param>
/// <param name="drawningCarHeight">Высота прорисовки самолёта</param> /// <param name="drawningCarHeight">Высота прорисовки самолёта</param>
protected DrawningPlane(int drawningFighterWidth, int drawningFighterHeight) : this() protected DrawningMilitaryAircraft(int drawningMilitaryAircraftWidth, int drawningMilitaryAircraftHeight) : this()
{ {
_drawningFighterWidth = drawningFighterWidth; _drawningMilitaryAircraftWidth = drawningMilitaryAircraftWidth;
_drawningFighterHeight = drawningFighterHeight; _drawningMilitaryAircraftHeight = drawningMilitaryAircraftHeight;
} }
public bool SetPictureSize(int width, int height) public bool SetPictureSize(int width, int height)
{ {
if (_drawningFighterWidth < width && _drawningFighterHeight < height) if (_drawningMilitaryAircraftWidth < width && _drawningMilitaryAircraftHeight < height)
{ {
_pictureWidth = width; _pictureWidth = width;
_pictureHeight = height; _pictureHeight = height;
@ -118,9 +118,9 @@ public class DrawningPlane
return; return;
} }
if (x + _drawningFighterWidth > _pictureWidth) if (x + _drawningMilitaryAircraftWidth > _pictureWidth)
{ {
_startPosX = _pictureWidth - _drawningFighterWidth; _startPosX = _pictureWidth - _drawningMilitaryAircraftWidth;
} }
else if (x < 0) else if (x < 0)
{ {
@ -130,9 +130,9 @@ public class DrawningPlane
{ {
_startPosX = x; _startPosX = x;
} }
if (y + _drawningFighterHeight > _pictureHeight) if (y + _drawningMilitaryAircraftHeight > _pictureHeight)
{ {
_startPosY = _pictureHeight - _drawningFighterHeight; _startPosY = _pictureHeight - _drawningMilitaryAircraftHeight;
} }
else if (y < 0) else if (y < 0)
{ {
@ -146,7 +146,7 @@ public class DrawningPlane
public bool MoveTransport(DirectionType direction) public bool MoveTransport(DirectionType direction)
{ {
if (EntityPlane == null || !_startPosX.HasValue || !_startPosY.HasValue) if (EntityMilitaryAircraft == null || !_startPosX.HasValue || !_startPosY.HasValue)
{ {
return false; return false;
} }
@ -154,27 +154,27 @@ public class DrawningPlane
switch (direction) switch (direction)
{ {
case DirectionType.Left: case DirectionType.Left:
if (_startPosX.Value - EntityPlane.Step > 0) if (_startPosX.Value - EntityMilitaryAircraft.Step > 0)
{ {
_startPosX -= (int)EntityPlane.Step; _startPosX -= (int)EntityMilitaryAircraft.Step;
} }
return true; return true;
case DirectionType.Up: case DirectionType.Up:
if (_startPosY.Value - EntityPlane.Step > 0) if (_startPosY.Value - EntityMilitaryAircraft.Step > 0)
{ {
_startPosY -= (int)EntityPlane.Step; _startPosY -= (int)EntityMilitaryAircraft.Step;
} }
return true; return true;
case DirectionType.Right: case DirectionType.Right:
if (_startPosX.Value + _drawningFighterWidth + EntityPlane.Step < _pictureWidth) if (_startPosX.Value + _drawningMilitaryAircraftWidth + EntityMilitaryAircraft.Step < _pictureWidth)
{ {
_startPosX += (int)EntityPlane.Step; _startPosX += (int)EntityMilitaryAircraft.Step;
} }
return true; return true;
case DirectionType.Down: case DirectionType.Down:
if (_startPosY.Value + _drawningFighterHeight + EntityPlane.Step < _pictureHeight) if (_startPosY.Value + _drawningMilitaryAircraftHeight + EntityMilitaryAircraft.Step < _pictureHeight)
{ {
_startPosY += (int)EntityPlane.Step; _startPosY += (int)EntityMilitaryAircraft.Step;
} }
return true; return true;
default: default:
@ -184,13 +184,13 @@ public class DrawningPlane
public virtual void DrawTransport(Graphics g) public virtual void DrawTransport(Graphics g)
{ {
if (EntityPlane == null || !_startPosX.HasValue || !_startPosY.HasValue) if (EntityMilitaryAircraft == null || !_startPosX.HasValue || !_startPosY.HasValue)
{ {
return; return;
} }
Pen pen = new(Color.Black); Pen pen = new(Color.Black);
Brush br = new SolidBrush(EntityPlane.BodyColor); Brush br = new SolidBrush(EntityMilitaryAircraft.BodyColor);
g.FillRectangle(br, _startPosX.Value + 10, _startPosY.Value + 30, 60, 10); g.FillRectangle(br, _startPosX.Value + 10, _startPosY.Value + 30, 60, 10);
g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 30, 60, 10); g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 30, 60, 10);

2
AirFighter/AirFighter/Entities/EntityAirFighter.cs
View File

@ -3,7 +3,7 @@
/// <summary> /// <summary>
/// Класс-сущность "Истребитель" /// Класс-сущность "Истребитель"
/// </summary> /// </summary>
public class EntityAirFighter : EntityPlane public class EntityAirFighter : EntityMilitaryAircraft
{ {
public Color AdditionalColor { get; private set; } public Color AdditionalColor { get; private set; }

4
AirFighter/AirFighter/Entities/EntityPlane.cs → AirFighter/AirFighter/Entities/EntityMilitaryAircraft.cs
View File

@ -3,7 +3,7 @@
/// <summary> /// <summary>
/// Класс-сущность "Истребитель" /// Класс-сущность "Истребитель"
/// </summary> /// </summary>
public class EntityPlane public class EntityMilitaryAircraft
{ {
public int Speed { get; private set; } public int Speed { get; private set; }
@ -20,7 +20,7 @@ public class EntityPlane
/// <param name="weight">Вес автомобиля</param> /// <param name="weight">Вес автомобиля</param>
/// <param name="bodyColor">Основной цвет</param> /// <param name="bodyColor">Основной цвет</param>
public EntityPlane (int speed, double weight, Color bodyColor) public EntityMilitaryAircraft (int speed, double weight, Color bodyColor)
{ {
Speed = speed; Speed = speed;
Weight = weight; Weight = weight;

285
AirFighter/AirFighter/FormAirCollection.Designer.cs generated
View File

@ -29,98 +29,67 @@
private void InitializeComponent() private void InitializeComponent()
{ {
groupBoxTools = new GroupBox(); groupBoxTools = new GroupBox();
panelCompanyTools = new Panel();
buttonCreateCompany = new Button();
comboBoxSelectorCompany = new ComboBox();
buttonRefresh = new Button(); buttonRefresh = new Button();
buttonAddMilitaryAircraft = new Button();
buttonGoToCheck = new Button(); buttonGoToCheck = new Button();
buttonAddAirFighter = new Button();
buttonRemoveAir = new Button(); buttonRemoveAir = new Button();
maskedTextBoxPosition = new MaskedTextBox(); maskedTextBoxPosition = new MaskedTextBox();
buttonAddAirFighter = new Button(); panelStorage = new Panel();
buttonAddAir = new Button(); buttonCollectionDel = new Button();
comboBoxSelectorCompany = new ComboBox(); listBoxCollection = new ListBox();
buttonCollectionAdd = new Button();
radioButtonList = new RadioButton();
radioButtonMassive = new RadioButton();
textBoxCollectionName = new TextBox();
labelCollectionName = new Label();
pictureBox = new PictureBox(); pictureBox = new PictureBox();
groupBoxTools.SuspendLayout(); groupBoxTools.SuspendLayout();
panelCompanyTools.SuspendLayout();
panelStorage.SuspendLayout();
((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
SuspendLayout(); SuspendLayout();
// //
// groupBoxTools // groupBoxTools
// //
groupBoxTools.Controls.Add(buttonRefresh); groupBoxTools.Controls.Add(panelCompanyTools);
groupBoxTools.Controls.Add(buttonGoToCheck); groupBoxTools.Controls.Add(panelStorage);
groupBoxTools.Controls.Add(buttonRemoveAir);
groupBoxTools.Controls.Add(maskedTextBoxPosition);
groupBoxTools.Controls.Add(buttonAddAirFighter);
groupBoxTools.Controls.Add(buttonAddAir);
groupBoxTools.Controls.Add(comboBoxSelectorCompany);
groupBoxTools.Dock = DockStyle.Right; groupBoxTools.Dock = DockStyle.Right;
groupBoxTools.Location = new Point(594, 0); groupBoxTools.Location = new Point(712, 0);
groupBoxTools.Name = "groupBoxTools"; groupBoxTools.Name = "groupBoxTools";
groupBoxTools.Size = new Size(206, 450); groupBoxTools.Size = new Size(206, 602);
groupBoxTools.TabIndex = 0; groupBoxTools.TabIndex = 0;
groupBoxTools.TabStop = false; groupBoxTools.TabStop = false;
groupBoxTools.Text = "Инструменты"; groupBoxTools.Text = "Инструменты";
// //
// buttonRefresh // panelCompanyTools
// //
buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; panelCompanyTools.Controls.Add(buttonCreateCompany);
buttonRefresh.Location = new Point(6, 395); panelCompanyTools.Controls.Add(comboBoxSelectorCompany);
buttonRefresh.Name = "buttonRefresh"; panelCompanyTools.Controls.Add(buttonRefresh);
buttonRefresh.Size = new Size(197, 29); panelCompanyTools.Controls.Add(buttonAddMilitaryAircraft);
buttonRefresh.TabIndex = 7; panelCompanyTools.Controls.Add(buttonGoToCheck);
buttonRefresh.Text = "Обновить"; panelCompanyTools.Controls.Add(buttonAddAirFighter);
buttonRefresh.UseVisualStyleBackColor = true; panelCompanyTools.Controls.Add(buttonRemoveAir);
buttonRefresh.Click += buttonRefresh_Click; panelCompanyTools.Controls.Add(maskedTextBoxPosition);
panelCompanyTools.Dock = DockStyle.Fill;
panelCompanyTools.Location = new Point(3, 293);
panelCompanyTools.Name = "panelCompanyTools";
panelCompanyTools.Size = new Size(200, 306);
panelCompanyTools.TabIndex = 10;
// //
// buttonGoToCheck // buttonCreateCompany
// //
buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; buttonCreateCompany.Location = new Point(11, 55);
buttonGoToCheck.Location = new Point(6, 328); buttonCreateCompany.Name = "buttonCreateCompany";
buttonGoToCheck.Name = "buttonGoToCheck"; buttonCreateCompany.Size = new Size(182, 27);
buttonGoToCheck.Size = new Size(197, 29); buttonCreateCompany.TabIndex = 9;
buttonGoToCheck.TabIndex = 6; buttonCreateCompany.Text = "Создать компанию";
buttonGoToCheck.Text = "Передать на тесты"; buttonCreateCompany.UseVisualStyleBackColor = true;
buttonGoToCheck.UseVisualStyleBackColor = true; buttonCreateCompany.Click += buttonCreateCompany_Click;
buttonGoToCheck.Click += buttonGoToCheck_Click;
//
// buttonRemoveAir
//
buttonRemoveAir.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonRemoveAir.Location = new Point(5, 211);
buttonRemoveAir.Name = "buttonRemoveAir";
buttonRemoveAir.Size = new Size(197, 29);
buttonRemoveAir.TabIndex = 5;
buttonRemoveAir.Text = "Удаление самолёта";
buttonRemoveAir.UseVisualStyleBackColor = true;
buttonRemoveAir.Click += buttonRemoveAir_Click;
//
// maskedTextBoxPosition
//
maskedTextBoxPosition.Location = new Point(6, 161);
maskedTextBoxPosition.Mask = "00";
maskedTextBoxPosition.Name = "maskedTextBoxPosition";
maskedTextBoxPosition.Size = new Size(194, 27);
maskedTextBoxPosition.TabIndex = 4;
maskedTextBoxPosition.ValidatingType = typeof(int);
//
// buttonAddAirFighter
//
buttonAddAirFighter.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonAddAirFighter.Location = new Point(6, 103);
buttonAddAirFighter.Name = "buttonAddAirFighter";
buttonAddAirFighter.Size = new Size(197, 31);
buttonAddAirFighter.TabIndex = 2;
buttonAddAirFighter.Text = "Добавление истребителя";
buttonAddAirFighter.UseVisualStyleBackColor = true;
buttonAddAirFighter.Click += buttonAddAirFighter_Click;
//
// buttonAddAir
//
buttonAddAir.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonAddAir.Location = new Point(6, 68);
buttonAddAir.Name = "buttonAddAir";
buttonAddAir.Size = new Size(197, 29);
buttonAddAir.TabIndex = 1;
buttonAddAir.Text = "Добавление самолёта";
buttonAddAir.UseVisualStyleBackColor = true;
buttonAddAir.Click += buttonAddAir_Click;
// //
// comboBoxSelectorCompany // comboBoxSelectorCompany
// //
@ -128,18 +97,163 @@
comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
comboBoxSelectorCompany.FormattingEnabled = true; comboBoxSelectorCompany.FormattingEnabled = true;
comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" }); comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
comboBoxSelectorCompany.Location = new Point(6, 26); comboBoxSelectorCompany.Location = new Point(7, 21);
comboBoxSelectorCompany.Name = "comboBoxSelectorCompany"; comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
comboBoxSelectorCompany.Size = new Size(194, 28); comboBoxSelectorCompany.Size = new Size(182, 28);
comboBoxSelectorCompany.TabIndex = 0; comboBoxSelectorCompany.TabIndex = 0;
comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged; //
// buttonRefresh
//
buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonRefresh.Location = new Point(9, 268);
buttonRefresh.Name = "buttonRefresh";
buttonRefresh.Size = new Size(179, 29);
buttonRefresh.TabIndex = 7;
buttonRefresh.Text = "Обновить";
buttonRefresh.UseVisualStyleBackColor = true;
buttonRefresh.Click += buttonRefresh_Click;
//
// buttonAddMilitaryAircraft
//
buttonAddMilitaryAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonAddMilitaryAircraft.Location = new Point(4, 99);
buttonAddMilitaryAircraft.Name = "buttonAddMilitaryAircraft";
buttonAddMilitaryAircraft.Size = new Size(193, 29);
buttonAddMilitaryAircraft.TabIndex = 1;
buttonAddMilitaryAircraft.Text = "Добавление самолёта";
buttonAddMilitaryAircraft.UseVisualStyleBackColor = true;
buttonAddMilitaryAircraft.Click += buttonAddAir_Click;
//
// buttonGoToCheck
//
buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonGoToCheck.Location = new Point(5, 227);
buttonGoToCheck.Name = "buttonGoToCheck";
buttonGoToCheck.Size = new Size(194, 29);
buttonGoToCheck.TabIndex = 6;
buttonGoToCheck.Text = "Передать на тесты";
buttonGoToCheck.UseVisualStyleBackColor = true;
buttonGoToCheck.Click += buttonGoToCheck_Click;
//
// buttonAddAirFighter
//
buttonAddAirFighter.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonAddAirFighter.Location = new Point(3, 122);
buttonAddAirFighter.Name = "buttonAddAirFighter";
buttonAddAirFighter.Size = new Size(194, 31);
buttonAddAirFighter.TabIndex = 2;
buttonAddAirFighter.Text = "Добавление истребителя";
buttonAddAirFighter.UseVisualStyleBackColor = true;
buttonAddAirFighter.Click += buttonAddAirFighter_Click;
//
// buttonRemoveAir
//
buttonRemoveAir.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonRemoveAir.Location = new Point(6, 192);
buttonRemoveAir.Name = "buttonRemoveAir";
buttonRemoveAir.Size = new Size(182, 29);
buttonRemoveAir.TabIndex = 5;
buttonRemoveAir.Text = "Удаление самолёта";
buttonRemoveAir.UseVisualStyleBackColor = true;
buttonRemoveAir.Click += buttonRemoveAir_Click;
//
// maskedTextBoxPosition
//
maskedTextBoxPosition.Location = new Point(7, 159);
maskedTextBoxPosition.Mask = "00";
maskedTextBoxPosition.Name = "maskedTextBoxPosition";
maskedTextBoxPosition.Size = new Size(194, 27);
maskedTextBoxPosition.TabIndex = 4;
maskedTextBoxPosition.ValidatingType = typeof(int);
//
// 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, 23);
panelStorage.Name = "panelStorage";
panelStorage.Size = new Size(200, 270);
panelStorage.TabIndex = 8;
//
// buttonCollectionDel
//
buttonCollectionDel.Location = new Point(7, 239);
buttonCollectionDel.Name = "buttonCollectionDel";
buttonCollectionDel.Size = new Size(182, 27);
buttonCollectionDel.TabIndex = 6;
buttonCollectionDel.Text = "Удалить коллекцию";
buttonCollectionDel.UseVisualStyleBackColor = true;
buttonCollectionDel.Click += buttonCollectionDel_Click;
//
// listBoxCollection
//
listBoxCollection.FormattingEnabled = true;
listBoxCollection.ItemHeight = 20;
listBoxCollection.Location = new Point(11, 129);
listBoxCollection.Name = "listBoxCollection";
listBoxCollection.Size = new Size(180, 104);
listBoxCollection.TabIndex = 5;
//
// buttonCollectionAdd
//
buttonCollectionAdd.Location = new Point(9, 96);
buttonCollectionAdd.Name = "buttonCollectionAdd";
buttonCollectionAdd.Size = new Size(182, 27);
buttonCollectionAdd.TabIndex = 4;
buttonCollectionAdd.Text = "Добавить коллекцию";
buttonCollectionAdd.UseVisualStyleBackColor = true;
buttonCollectionAdd.Click += buttonCollectionAdd_Click;
//
// radioButtonList
//
radioButtonList.AutoSize = true;
radioButtonList.Location = new Point(117, 66);
radioButtonList.Name = "radioButtonList";
radioButtonList.Size = new Size(80, 24);
radioButtonList.TabIndex = 3;
radioButtonList.TabStop = true;
radioButtonList.Text = "Список";
radioButtonList.UseVisualStyleBackColor = true;
//
// radioButtonMassive
//
radioButtonMassive.AutoSize = true;
radioButtonMassive.Location = new Point(9, 66);
radioButtonMassive.Name = "radioButtonMassive";
radioButtonMassive.Size = new Size(82, 24);
radioButtonMassive.TabIndex = 2;
radioButtonMassive.TabStop = true;
radioButtonMassive.Text = "Массив";
radioButtonMassive.UseVisualStyleBackColor = true;
//
// textBoxCollectionName
//
textBoxCollectionName.Location = new Point(9, 33);
textBoxCollectionName.Name = "textBoxCollectionName";
textBoxCollectionName.Size = new Size(188, 27);
textBoxCollectionName.TabIndex = 1;
//
// labelCollectionName
//
labelCollectionName.AutoSize = true;
labelCollectionName.Location = new Point(24, 10);
labelCollectionName.Name = "labelCollectionName";
labelCollectionName.Size = new Size(158, 20);
labelCollectionName.TabIndex = 0;
labelCollectionName.Text = "Название коллекции:";
// //
// pictureBox // pictureBox
// //
pictureBox.Dock = DockStyle.Fill; pictureBox.Dock = DockStyle.Fill;
pictureBox.Location = new Point(0, 0); pictureBox.Location = new Point(0, 0);
pictureBox.Name = "pictureBox"; pictureBox.Name = "pictureBox";
pictureBox.Size = new Size(594, 450); pictureBox.Size = new Size(712, 602);
pictureBox.TabIndex = 3; pictureBox.TabIndex = 3;
pictureBox.TabStop = false; pictureBox.TabStop = false;
// //
@ -147,13 +261,16 @@
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(800, 450); ClientSize = new Size(918, 602);
Controls.Add(pictureBox); Controls.Add(pictureBox);
Controls.Add(groupBoxTools); Controls.Add(groupBoxTools);
Name = "FormAirCollection"; Name = "FormAirCollection";
Text = "Коллекция самолётов"; Text = "Коллекция самолётов";
groupBoxTools.ResumeLayout(false); groupBoxTools.ResumeLayout(false);
groupBoxTools.PerformLayout(); panelCompanyTools.ResumeLayout(false);
panelCompanyTools.PerformLayout();
panelStorage.ResumeLayout(false);
panelStorage.PerformLayout();
((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
ResumeLayout(false); ResumeLayout(false);
} }
@ -162,12 +279,22 @@
private GroupBox groupBoxTools; private GroupBox groupBoxTools;
private ComboBox comboBoxSelectorCompany; private ComboBox comboBoxSelectorCompany;
private Button buttonAddAir; private Button buttonAddMilitaryAircraft;
private Button buttonAddAirFighter; private Button buttonAddAirFighter;
private PictureBox pictureBox; private PictureBox pictureBox;
private MaskedTextBox maskedTextBoxPosition; private MaskedTextBox maskedTextBoxPosition;
private Button buttonRemoveAir; private Button buttonRemoveAir;
private Button buttonRefresh; private Button buttonRefresh;
private Button buttonGoToCheck; private Button buttonGoToCheck;
private Panel panelStorage;
private TextBox textBoxCollectionName;
private Label labelCollectionName;
private RadioButton radioButtonList;
private RadioButton radioButtonMassive;
private Button buttonCollectionAdd;
private Button buttonCollectionDel;
private ListBox listBoxCollection;
private Button buttonCreateCompany;
private Panel panelCompanyTools;
} }
} }

133
AirFighter/AirFighter/FormAirCollection.cs
View File

@ -5,6 +5,11 @@ namespace ProjectAirFighter;
public partial class FormAirCollection : Form public partial class FormAirCollection : Form
{ {
/// <summary>
/// Хранилише коллекций
/// </summary>
private readonly StorageCollection<DrawningMilitaryAircraft> _storageCollection;
/// <summary> /// <summary>
/// Компания /// Компания
/// </summary> /// </summary>
@ -16,6 +21,7 @@ public partial class FormAirCollection : Form
public FormAirCollection() public FormAirCollection()
{ {
InitializeComponent(); InitializeComponent();
_storageCollection = new();
} }
/// <summary> /// <summary>
@ -23,14 +29,9 @@ public partial class FormAirCollection : Form
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
private void comboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e) private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
{ {
switch (comboBoxSelectorCompany.Text) panelCompanyTools.Enabled = false;
{
case "Хранилище":
_company = new Angar(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningPlane>());
break;
}
} }
/// <summary> /// <summary>
@ -38,7 +39,7 @@ public partial class FormAirCollection : Form
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
private void buttonAddAir_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningPlane)); private void buttonAddAir_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningMilitaryAircraft));
/// <summary> /// <summary>
/// Добавление истребителя /// Добавление истребителя
@ -47,6 +48,10 @@ public partial class FormAirCollection : Form
/// <param name="e"></param> /// <param name="e"></param>
private void buttonAddAirFighter_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAirFighter)); private void buttonAddAirFighter_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAirFighter));
/// <summary>
/// Создание объекта класса-перемещенияв
/// </summary>
/// <param name="type"></param>
private void CreateObject(string type) private void CreateObject(string type)
{ {
if (_company == null) if (_company == null)
@ -55,14 +60,14 @@ public partial class FormAirCollection : Form
} }
Random random = new(); Random random = new();
DrawningPlane drawningFighter; DrawningMilitaryAircraft drawningMilitaryAircraft;
switch (type) switch (type)
{ {
case nameof(DrawningPlane): case nameof(DrawningMilitaryAircraft):
drawningFighter = new DrawningPlane(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); drawningMilitaryAircraft = new DrawningMilitaryAircraft(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
break; break;
case nameof(DrawningAirFighter): case nameof(DrawningAirFighter):
drawningFighter = new DrawningAirFighter(random.Next(100, 300), random.Next(1000, 3000), drawningMilitaryAircraft = new DrawningAirFighter(random.Next(100, 300), random.Next(1000, 3000),
GetColor(random), GetColor(random), GetColor(random), GetColor(random),
Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
break; break;
@ -70,7 +75,7 @@ public partial class FormAirCollection : Form
return; return;
} }
if (_company + drawningFighter != -1) if (_company + drawningMilitaryAircraft != -1)
{ {
MessageBox.Show("Объект добавлен"); MessageBox.Show("Объект добавлен");
pictureBox.Image = _company.Show(); pictureBox.Image = _company.Show();
@ -140,7 +145,7 @@ public partial class FormAirCollection : Form
return; return;
} }
DrawningPlane? plane = null; DrawningMilitaryAircraft? plane = null;
int counter = 100; int counter = 100;
while (plane == null) while (plane == null)
{ {
@ -178,4 +183,104 @@ public partial class FormAirCollection : Form
pictureBox.Image = _company.Show(); pictureBox.Image = _company.Show();
} }
/// <summary>
/// Добавление коллекции
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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();
}
/// <summary>
/// Удаление коллекции
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void buttonCollectionDel_Click(object sender, EventArgs e)
{
// TODO прописать логику удаления элемента из коллекции
// нужно убедиться, что есть выбранная коллекция
// спросить у пользователя через MessageBox, что он подтверждает, что хочет удалить запись
// удалить и обновить ListBox
if (listBoxCollection.SelectedItem == null)
{
MessageBox.Show("Коллекция не выбрана");
return;
}
if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
{
return;
}
_storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
RerfreshListBoxItems();
}
/// <summary>
/// Обновление списка в listBoxCollection
/// </summary>
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);
}
}
}
/// <summary>
/// Создание компании
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void buttonCreateCompany_Click(object sender, EventArgs e)
{
if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
{
MessageBox.Show("Коллекция не выбрана");
return;
}
ICollectionGenericObjects<DrawningMilitaryAircraft>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
if (collection == null)
{
MessageBox.Show("Коллекция не проинициализирована");
return;
}
switch (comboBoxSelectorCompany.Text)
{
case "Хранилище":
_company = new Angar(pictureBox.Width, pictureBox.Height, collection);
break;
}
panelCompanyTools.Enabled = true;
RerfreshListBoxItems();
}
} }

2
AirFighter/AirFighter/FormAirCollection.resx
View File

@ -28,7 +28,7 @@
</data> </data>
There are any number of "resheader" rows that contain simple There are any number of "resheader" rows that contain simple
name/value pplanes. name/value pairs.
Each data row contains a name, and value. The row also contains a Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support type or mimetype. Type corresponds to a .NET class that support

26
AirFighter/AirFighter/FormAirFighter.cs
View File

@ -5,7 +5,7 @@ namespace ProjectAirFighter;
public partial class FormAirFighter : Form public partial class FormAirFighter : Form
{ {
private DrawningPlane? _drawningFighter; private DrawningMilitaryAircraft? _drawningMilitaryAircraft;
private AbstractStrategy? _strategy; private AbstractStrategy? _strategy;
@ -15,12 +15,12 @@ public partial class FormAirFighter : Form
_strategy = null; _strategy = null;
} }
public DrawningPlane SetAir public DrawningMilitaryAircraft SetAir
{ {
set set
{ {
_drawningFighter = value; _drawningMilitaryAircraft = value;
_drawningFighter.SetPictureSize(pictureBoxAirFighter.Width, pictureBoxAirFighter.Height); _drawningMilitaryAircraft.SetPictureSize(pictureBoxAirFighter.Width, pictureBoxAirFighter.Height);
comboBoxStrategy.Enabled = true; comboBoxStrategy.Enabled = true;
_strategy = null; _strategy = null;
Draw(); Draw();
@ -29,20 +29,20 @@ public partial class FormAirFighter : Form
private void Draw() private void Draw()
{ {
if (_drawningFighter == null) if (_drawningMilitaryAircraft == null)
{ {
return; return;
} }
Bitmap bmp = new(pictureBoxAirFighter.Width, pictureBoxAirFighter.Height); Bitmap bmp = new(pictureBoxAirFighter.Width, pictureBoxAirFighter.Height);
Graphics gr = Graphics.FromImage(bmp); Graphics gr = Graphics.FromImage(bmp);
_drawningFighter.DrawTransport(gr); _drawningMilitaryAircraft.DrawTransport(gr);
pictureBoxAirFighter.Image = bmp; pictureBoxAirFighter.Image = bmp;
} }
private void ButtonMove_Click(object sender, EventArgs e) private void ButtonMove_Click(object sender, EventArgs e)
{ {
if (_drawningFighter == null) if (_drawningMilitaryAircraft == null)
{ {
return; return;
} }
@ -52,16 +52,16 @@ public partial class FormAirFighter : Form
switch (name) switch (name)
{ {
case "buttonUp": case "buttonUp":
result = _drawningFighter.MoveTransport(DirectionType.Up); result = _drawningMilitaryAircraft.MoveTransport(DirectionType.Up);
break; break;
case "buttonDown": case "buttonDown":
result = _drawningFighter.MoveTransport(DirectionType.Down); result = _drawningMilitaryAircraft.MoveTransport(DirectionType.Down);
break; break;
case "buttonLeft": case "buttonLeft":
result = _drawningFighter.MoveTransport(DirectionType.Left); result = _drawningMilitaryAircraft.MoveTransport(DirectionType.Left);
break; break;
case "buttonRight": case "buttonRight":
result = _drawningFighter.MoveTransport(DirectionType.Right); result = _drawningMilitaryAircraft.MoveTransport(DirectionType.Right);
break; break;
} }
@ -73,7 +73,7 @@ public partial class FormAirFighter : Form
private void ButtonStrategyStep_Click(object sender, EventArgs e) private void ButtonStrategyStep_Click(object sender, EventArgs e)
{ {
if (_drawningFighter == null) if (_drawningMilitaryAircraft == null)
{ {
return; return;
} }
@ -90,7 +90,7 @@ public partial class FormAirFighter : Form
{ {
return; return;
} }
_strategy.SetData(new MoveableAir(_drawningFighter), pictureBoxAirFighter.Width, pictureBoxAirFighter.Height); _strategy.SetData(new MoveableAir(_drawningMilitaryAircraft), pictureBoxAirFighter.Width, pictureBoxAirFighter.Height);
} }
if (_strategy == null) if (_strategy == null)

10
AirFighter/AirFighter/MovementStrategy/MoveableAir.cs
View File

@ -10,13 +10,13 @@ public class MoveableAir : IMoveableObject
/// <summary> /// <summary>
/// Поле-объект класса DrawningCar или его наследника /// Поле-объект класса DrawningCar или его наследника
/// </summary> /// </summary>
private readonly DrawningPlane? _plane = null; private readonly DrawningMilitaryAircraft? _plane = null;
/// <summary> /// <summary>
/// Конструктор /// Конструктор
/// </summary> /// </summary>
/// <param name="car">Объект класса DrawningCar</param> /// <param name="car">Объект класса DrawningCar</param>
public MoveableAir(DrawningPlane plane) public MoveableAir(DrawningMilitaryAircraft plane)
{ {
_plane = plane; _plane = plane;
} }
@ -25,7 +25,7 @@ public class MoveableAir : IMoveableObject
{ {
get get
{ {
if (_plane == null || _plane.EntityPlane == null || !_plane.GetPosX.HasValue || !_plane.GetPosY.HasValue) if (_plane == null || _plane.EntityMilitaryAircraft == null || !_plane.GetPosX.HasValue || !_plane.GetPosY.HasValue)
{ {
return null; return null;
} }
@ -33,11 +33,11 @@ public class MoveableAir : IMoveableObject
} }
} }
public int GetStep => (int)(_plane?.EntityPlane?.Step ?? 0); public int GetStep => (int)(_plane?.EntityMilitaryAircraft?.Step ?? 0);
public bool TryMoveObject(MovementDirection direction) public bool TryMoveObject(MovementDirection direction)
{ {
if (_plane == null || _plane.EntityPlane == null) if (_plane == null || _plane.EntityMilitaryAircraft == null)
{ {
return false; return false;
} }