diff --git a/AircraftCarrier/AircraftCarrier/DrawningModernAircraftCarrier.cs b/AircraftCarrier/AircraftCarrier/DrawningModernAircraftCarrier.cs index fbc7d11..b820f0f 100644 --- a/AircraftCarrier/AircraftCarrier/DrawningModernAircraftCarrier.cs +++ b/AircraftCarrier/AircraftCarrier/DrawningModernAircraftCarrier.cs @@ -22,7 +22,7 @@ dopColor, bool flightDeck, bool hangarDeck, bool route) : } Pen pen = new(Color.Black); Brush dopBrush = new SolidBrush(modernAircraftCarrier.DopColor); - + if (modernAircraftCarrier.FlightDeck) { g.DrawRectangle(pen, _startPosX + 10, _startPosY, 160, 10); diff --git a/AircraftCarrier/AircraftCarrier/EntityAircraftCarrier.cs b/AircraftCarrier/AircraftCarrier/EntityAircraftCarrier.cs index 3ae43c3..286fd02 100644 --- a/AircraftCarrier/AircraftCarrier/EntityAircraftCarrier.cs +++ b/AircraftCarrier/AircraftCarrier/EntityAircraftCarrier.cs @@ -9,13 +9,9 @@ namespace AircraftCarrier public class EntityAircraftCarrier { public int Speed { get; private set; } - public float Weight { get; private set; } - public Color BodyColor { get; private set; } - public float Step => Speed * 100 / Weight; - public EntityAircraftCarrier(int speed, float weight, Color bodyColor) { Random rnd = new Random(); @@ -23,6 +19,5 @@ namespace AircraftCarrier Weight = weight <= 0 ? rnd.Next(40, 70) : weight; BodyColor = bodyColor; } - } } \ No newline at end of file diff --git a/AircraftCarrier/AircraftCarrier/FormAircraftCarrier.cs b/AircraftCarrier/AircraftCarrier/FormAircraftCarrier.cs index 99d1e9e..671d27f 100644 --- a/AircraftCarrier/AircraftCarrier/FormAircraftCarrier.cs +++ b/AircraftCarrier/AircraftCarrier/FormAircraftCarrier.cs @@ -25,7 +25,6 @@ namespace AircraftCarrier _aircraftcarrier?.DrawTransport(gr); pictureBoxAircraftCarrier.Image = bmp; } - private void SetData() { Random rnd = new();