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

Внесены изменения в именах

Browse Source
This commit is contained in:
ikswi 2024-04-01 00:59:32 +04:00
parent 9654506023
commit 8c4a09a8b5
15 changed files with 98 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
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;
@ -55,11 +55,11 @@ public abstract class AbstractCompany
/// Перегрузка оператора сложения для класса /// Перегрузка оператора сложения для класса
/// </summary> /// </summary>
/// <param name="company">Компания</param> /// <param name="company">Компания</param>
/// <param name="plane">Добавляемый объект</param> /// <param name="militaryAircraft">Добавляемый объект</param>
/// <returns></returns> /// <returns></returns>
public static int operator +(AbstractCompany company, DrawningPlane plane) public static int operator +(AbstractCompany company, DrawningMilitaryAircraft militaryAircraft)
{ {
return company._collection.Insert(plane); return company._collection.Insert(militaryAircraft);
} }
/// <summary> /// <summary>
@ -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)
{ {
} }

12
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,22 +19,22 @@ 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 militaryAircraftFighter || !_startPosX.HasValue || !_startPosY.HasValue)
{ {
return; return;
} }
Pen pen = new(Color.Black); Pen pen = new(Color.Black);
Brush additionalBrush = new SolidBrush(planeFighter.AdditionalColor); Brush additionalBrush = new SolidBrush(militaryAircraftFighter.AdditionalColor);
base.DrawTransport(g); base.DrawTransport(g);
if (planeFighter.Wings) if (militaryAircraftFighter.Wings)
{ {
Point wings1 = new Point(_startPosX.Value + 45, _startPosY.Value + 30); Point wings1 = new Point(_startPosX.Value + 45, _startPosY.Value + 30);
Point wings2 = new Point(_startPosX.Value + 45, _startPosY.Value + 15); Point wings2 = new Point(_startPosX.Value + 45, _startPosY.Value + 15);
@ -53,7 +53,7 @@ public class DrawningAirFighter : DrawningPlane
g.DrawPolygon(pen, DownWing); g.DrawPolygon(pen, DownWing);
} }
if (planeFighter.Rockets) if (militaryAircraftFighter.Rockets)
{ {
Point rocket1 = new Point(_startPosX.Value + 40, _startPosY.Value + 5); Point rocket1 = new Point(_startPosX.Value + 40, _startPosY.Value + 5);
Point rocket2 = new Point(_startPosX.Value + 15, _startPosY.Value + 5); Point rocket2 = new Point(_startPosX.Value + 15, _startPosY.Value + 5);

60
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,25 +79,25 @@ 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>
/// Конструктор для наследников /// Конструктор для наследников
/// </summary> /// </summary>
/// <param name="drawningCarWidth">Ширина прорисовки самолёта</param> /// <param name="drawningMilitaryAircraftWidth">Ширина прорисовки самолёта</param>
/// <param name="drawningCarHeight">Высота прорисовки самолёта</param> /// <param name="drawningMilitaryAircraftHeight">Высота прорисовки самолёта</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; }

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

@ -1,9 +1,9 @@
namespace ProjectAirFighter.Entities; namespace ProjectAirFighter.Entities;
/// <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;

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

@ -127,7 +127,7 @@
comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
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(6, 26);
comboBoxSelectorCompany.Name = "comboBoxSelectorCompany"; comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
comboBoxSelectorCompany.Size = new Size(194, 28); comboBoxSelectorCompany.Size = new Size(194, 28);

24
AirFighter/AirFighter/FormAirCollection.cs
View File

@ -28,7 +28,7 @@ public partial class FormAirCollection : Form
switch (comboBoxSelectorCompany.Text) switch (comboBoxSelectorCompany.Text)
{ {
case "Хранилище": case "Хранилище":
_company = new Angar(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningPlane>()); _company = new Angar(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningMilitaryAircraft>());
break; break;
} }
} }
@ -38,7 +38,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>
/// Добавление истребителя /// Добавление истребителя
@ -55,14 +55,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 +70,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,11 +140,11 @@ public partial class FormAirCollection : Form
return; return;
} }
DrawningPlane? plane = null; DrawningMilitaryAircraft? militaryAircraft = null;
int counter = 100; int counter = 100;
while (plane == null) while (militaryAircraft == null)
{ {
plane = _company.GetRandomObject(); militaryAircraft = _company.GetRandomObject();
counter--; counter--;
if (counter <= 0) if (counter <= 0)
{ {
@ -152,14 +152,14 @@ public partial class FormAirCollection : Form
} }
} }
if (plane == null) if (militaryAircraft == null)
{ {
return; return;
} }
FormAirFighter form = new() FormAirFighter form = new()
{ {
SetAir = plane SetAir = militaryAircraft
}; };
form.ShowDialog(); form.ShowDialog();
} }

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 MoveableMilitaryAircraft(_drawningMilitaryAircraft), pictureBoxAirFighter.Width, pictureBoxAirFighter.Height);
} }
if (_strategy == null) if (_strategy == null)

2
AirFighter/AirFighter/FormAirFighter.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 pmilitaryAircrafts.
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

6
AirFighter/AirFighter/MovementStrategy/MoveToBorder.cs
View File

@ -10,8 +10,10 @@ public class MoveToBorder : AbstractStrategy
return false; return false;
} }
return objParams.RightBorder <= FieldWidth && objParams.RightBorder + GetStep() >= FieldWidth && return objParams.RightBorder <= FieldWidth &&
objParams.DownBorder <= FieldHeight && objParams.DownBorder + GetStep() >= FieldHeight; objParams.RightBorder + GetStep() >= FieldWidth &&
objParams.DownBorder <= FieldHeight &&
objParams.DownBorder + GetStep() >= FieldHeight;
} }
protected override void MoveToTarget() protected override void MoveToTarget()

6
AirFighter/AirFighter/MovementStrategy/MoveToCenter.cs
View File

@ -13,8 +13,10 @@ public class MoveToCenter : AbstractStrategy
return false; return false;
} }
return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth / 2 && objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 && return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth / 2 &&
objParams.ObjectMiddleVertical - GetStep() <= FieldHeight / 2 && objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2; objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
objParams.ObjectMiddleVertical - GetStep() <= FieldHeight / 2 &&
objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
} }
protected override void MoveToTarget() protected override void MoveToTarget()

24
AirFighter/AirFighter/MovementStrategy/MoveableAir.cs → AirFighter/AirFighter/MovementStrategy/MoveableMilitaryAircraft.cs
View File

@ -3,46 +3,46 @@
namespace ProjectAirFighter.MovementStrategy; namespace ProjectAirFighter.MovementStrategy;
/// <summary> /// <summary>
/// Класс-реализация IMoveableObject с использованием DrawningCar /// Класс-реализация IMoveableObject с использованием DrawningMilitaryAircraft
/// </summary> /// </summary>
public class MoveableAir : IMoveableObject public class MoveableMilitaryAircraft : IMoveableObject
{ {
/// <summary> /// <summary>
/// Поле-объект класса DrawningCar или его наследника /// Поле-объект класса DrawningMilitaryAircraft или его наследника
/// </summary> /// </summary>
private readonly DrawningPlane? _plane = null; private readonly DrawningMilitaryAircraft? _militaryAircraft = null;
/// <summary> /// <summary>
/// Конструктор /// Конструктор
/// </summary> /// </summary>
/// <param name="car">Объект класса DrawningCar</param> /// <param name="militaryAircraft">Объект класса DrawningMilitaryAircraft</param>
public MoveableAir(DrawningPlane plane) public MoveableMilitaryAircraft(DrawningMilitaryAircraft militaryAircraft)
{ {
_plane = plane; _militaryAircraft = militaryAircraft;
} }
public ObjectParameters? GetObjectPosition public ObjectParameters? GetObjectPosition
{ {
get get
{ {
if (_plane == null || _plane.EntityPlane == null || !_plane.GetPosX.HasValue || !_plane.GetPosY.HasValue) if (_militaryAircraft == null || _militaryAircraft.EntityMilitaryAircraft == null || !_militaryAircraft.GetPosX.HasValue || !_militaryAircraft.GetPosY.HasValue)
{ {
return null; return null;
} }
return new ObjectParameters(_plane.GetPosX.Value, _plane.GetPosY.Value, _plane.GetWidth, _plane.GetHeight); return new ObjectParameters(_militaryAircraft.GetPosX.Value, _militaryAircraft.GetPosY.Value, _militaryAircraft.GetWidth, _militaryAircraft.GetHeight);
} }
} }
public int GetStep => (int)(_plane?.EntityPlane?.Step ?? 0); public int GetStep => (int)(_militaryAircraft?.EntityMilitaryAircraft?.Step ?? 0);
public bool TryMoveObject(MovementDirection direction) public bool TryMoveObject(MovementDirection direction)
{ {
if (_plane == null || _plane.EntityPlane == null) if (_militaryAircraft == null || _militaryAircraft.EntityMilitaryAircraft == null)
{ {
return false; return false;
} }
return _plane.MoveTransport(GetDirectionType(direction)); return _militaryAircraft.MoveTransport(GetDirectionType(direction));
} }
/// <summary> /// <summary>

2
AirFighter/AirFighter/Properties/Resources.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 pmilitaryAircrafts.
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