diff --git a/solution/lab1/Drawnings/DrawningEntityFighter.cs b/solution/lab1/Drawnings/DrawningEntityFighter.cs index 06c557a..8759fe5 100644 --- a/solution/lab1/Drawnings/DrawningEntityFighter.cs +++ b/solution/lab1/Drawnings/DrawningEntityFighter.cs @@ -33,52 +33,14 @@ public class DrawningEntityFighter : DrawningTrackedVehicle Brush CraneBrush = new SolidBrush(fighter.AdditionalColor); - //корпус - g.FillRectangle(BodyBrush, _startPosX.Value + 10, _startPosY.Value + 30, 62, 12); - g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 30, 62, 12); - g.FillRectangle(BodyBrush, _startPosX.Value + 22, _startPosY.Value + 16, 4, 15); - g.DrawRectangle(pen, _startPosX.Value + 22, _startPosY.Value + 16, 4, 14); - g.FillRectangle(BodyBrush, _startPosX.Value + 37, _startPosY.Value + 1, 5, 30); - g.DrawRectangle(pen, _startPosX.Value + 37, _startPosY.Value + 1, 5, 30); - - //стекло - g.FillRectangle(additionalBrush, _startPosX.Value + 52, _startPosY.Value + 14, 21, 16); - g.DrawRectangle(pen, _startPosX.Value + 52, _startPosY.Value + 14, 20, 16); - - //гусеницы - g.DrawLine(pen, _startPosX.Value + 8, _startPosY.Value + 42, _startPosX.Value + 10, _startPosY.Value + 42); - g.DrawLine(pen, _startPosX.Value + 7, _startPosY.Value + 43, _startPosX.Value + 7, _startPosY.Value + 53); - g.DrawLine(pen, _startPosX.Value + 8, _startPosY.Value + 54, _startPosX.Value + 12, _startPosY.Value + 54); - g.DrawLine(pen, _startPosX.Value + 13, _startPosY.Value + 55, _startPosX.Value + 69, _startPosY.Value + 55); - g.DrawLine(pen, _startPosX.Value + 70, _startPosY.Value + 54, _startPosX.Value + 73, _startPosY.Value + 54); - g.DrawLine(pen, _startPosX.Value + 74, _startPosY.Value + 53, _startPosX.Value + 74, _startPosY.Value + 43); - g.DrawLine(pen, _startPosX.Value + 71, _startPosY.Value + 42, _startPosX.Value + 73, _startPosY.Value + 42); - - //колеса - g.FillEllipse(BodyBrush, _startPosX.Value + 10, _startPosY.Value + 44, 9, 9); - g.DrawEllipse(pen, _startPosX.Value + 10, _startPosY.Value + 44, 9, 9); - g.FillEllipse(BodyBrush, _startPosX.Value + 63, _startPosY.Value + 44, 9, 9); - g.DrawEllipse(pen, _startPosX.Value + 63, _startPosY.Value + 44, 9, 9); - - g.FillEllipse(BodyBrush, _startPosX.Value + 25, _startPosY.Value + 48, 6, 6); - g.DrawEllipse(pen, _startPosX.Value + 25, _startPosY.Value + 48, 6, 6); - g.FillEllipse(BodyBrush, _startPosX.Value + 38, _startPosY.Value + 48, 6, 6); - g.DrawEllipse(pen, _startPosX.Value + 38, _startPosY.Value + 48, 6, 6); - g.FillEllipse(BodyBrush, _startPosX.Value + 50, _startPosY.Value + 48, 6, 6); - g.DrawEllipse(pen, _startPosX.Value + 50, _startPosY.Value + 48, 6, 6); - - g.FillEllipse(BodyBrush, _startPosX.Value + 33, _startPosY.Value + 44, 4, 4); - g.DrawEllipse(pen, _startPosX.Value + 33, _startPosY.Value + 44, 4, 4); - g.FillEllipse(BodyBrush, _startPosX.Value + 45, _startPosY.Value + 44, 4, 4); - g.DrawEllipse(pen, _startPosX.Value + 45, _startPosY.Value + 44, 4, 4); - + _startPosX += 10; - _startPosY += 25; + base.DrawTransport(g); _startPosX -= 10; - _startPosY -= 25; + if (fighter.Kovsh) {