diff --git a/ProjectAircraftCarrier/ProjectAircraftCarrier/Drawnings/DrawningAircraftCarrier.cs b/ProjectAircraftCarrier/ProjectAircraftCarrier/Drawnings/DrawningAircraftCarrier.cs
index 46e14b2..21c0608 100644
--- a/ProjectAircraftCarrier/ProjectAircraftCarrier/Drawnings/DrawningAircraftCarrier.cs
+++ b/ProjectAircraftCarrier/ProjectAircraftCarrier/Drawnings/DrawningAircraftCarrier.cs
@@ -17,28 +17,25 @@ public class DrawningAircraftCarrier : DrawningWarship
/// Дополнительный цвет
/// Признак наличия взлётно-посадочной полосы
/// Признак наличия рубки управления
- public DrawningAircraftCarrier(int speed, double weight, Color bodyColor, Color additionalColor, bool aircraftDeck, bool controlRoom) : base(145, 55)
+ public DrawningAircraftCarrier(int speed, double weight, Color bodyColor, Color additionalColor, bool aircraftDeck, bool controlRoom) : base(145, 57)
{
EntityWarship = new EntityAircraftCarrier(speed, weight, bodyColor, additionalColor, aircraftDeck, controlRoom);
}
public override void DrawTransport(Graphics g)
{
- if (EntityWarship == null || EntityWarship is not EntityAircraftCarrier warship || !_startPosX.HasValue || !_startPosY.HasValue)
+ if (EntityWarship == null || EntityWarship is not EntityAircraftCarrier aircraftcarrier || !_startPosX.HasValue || !_startPosY.HasValue)
{
return;
}
Pen pen = new(Color.Black);
- Brush additionalBrush = new SolidBrush(warship.AdditionalColor);
+ Brush additionalBrush = new SolidBrush(aircraftcarrier.AdditionalColor);
- _startPosX += 5;
- _startPosY += 10;
base.DrawTransport(g);
-
//рубка управления
- if (warship.ControlRoom)
+ if (aircraftcarrier.ControlRoom)
{
g.FillRectangle(additionalBrush, _startPosX.Value + 35, _startPosY.Value + 42, 15, 15);
g.FillRectangle(additionalBrush, _startPosX.Value + 65, _startPosY.Value + 42, 15, 15);
@@ -56,7 +53,7 @@ public class DrawningAircraftCarrier : DrawningWarship
}
//палуба для взлёта самолётов
- if (warship.AircraftDeck)
+ if (aircraftcarrier.AircraftDeck)
{
Point[] DeckPoint =
{
@@ -68,9 +65,6 @@ public class DrawningAircraftCarrier : DrawningWarship
g.FillPolygon(additionalBrush, DeckPoint);
g.DrawPolygon(pen, DeckPoint);
g.DrawLine(pen, _startPosX.Value + 5, _startPosY.Value + 35, _startPosX.Value + 50, _startPosY.Value + 10);
-
- _startPosX -= 5;
- _startPosX -= 10;
}
}
}
diff --git a/ProjectAircraftCarrier/ProjectAircraftCarrier/Drawnings/DrawningWarship.cs b/ProjectAircraftCarrier/ProjectAircraftCarrier/Drawnings/DrawningWarship.cs
index fa2bc32..a2a35a5 100644
--- a/ProjectAircraftCarrier/ProjectAircraftCarrier/Drawnings/DrawningWarship.cs
+++ b/ProjectAircraftCarrier/ProjectAircraftCarrier/Drawnings/DrawningWarship.cs
@@ -94,10 +94,10 @@ public class DrawningWarship
///
/// Ширина прорисовки военного корабля
/// Высота прорисовки военного корабля
- protected DrawningWarship(int drawningAircraftCarrierWidth, int drawningAircraftCarrierHeight) : this()
+ protected DrawningWarship(int drawningWarshipWidth, int drawningWarshipHeight) : this()
{
- _drawningWarshipWidth = drawningAircraftCarrierWidth;
- _drawningWarshipHeight = drawningAircraftCarrierHeight;
+ _drawningWarshipWidth = drawningWarshipWidth;
+ _drawningWarshipHeight = drawningWarshipHeight;
}
///
diff --git a/ProjectAircraftCarrier/ProjectAircraftCarrier/FormAircraftCarrier.cs b/ProjectAircraftCarrier/ProjectAircraftCarrier/FormAircraftCarrier.cs
index 0f52da8..75d24cc 100644
--- a/ProjectAircraftCarrier/ProjectAircraftCarrier/FormAircraftCarrier.cs
+++ b/ProjectAircraftCarrier/ProjectAircraftCarrier/FormAircraftCarrier.cs
@@ -145,7 +145,7 @@ public partial class FormAircraftCarrier : Form
_strategy = comboBoxStrategy.SelectedIndex switch
{
0 => new MoveToCenter(),
- 1 => new MoveToCenter(),
+ 1 => new MoveToBorder(),
_ => null,
};
if(_strategy == null)