diff --git a/Monorail/Monorail/DrawningAdvancedMonorail.cs b/Monorail/Monorail/DrawningAdvancedMonorail.cs index cb54cbf..c5e618a 100644 --- a/Monorail/Monorail/DrawningAdvancedMonorail.cs +++ b/Monorail/Monorail/DrawningAdvancedMonorail.cs @@ -11,12 +11,12 @@ namespace Monorail.DrawningObjects public class DrawningAdvancedMonorail : DrawningMonorail { public DrawningAdvancedMonorail(int speed, double weight, Color bodyColor, Color wheelColor, Color tireColor, int width, int height, int addWheelsNumb, - Color secondCabineColor, bool secondCabine, bool magniteRail) : base(speed, weight, bodyColor, wheelColor, tireColor, width, height) + Color additionalColor, bool secondCabine, bool magniteRail) : base(speed, weight, bodyColor, wheelColor, tireColor, width, height) { if(EntityMonorail != null) { EntityMonorail = new EntityAdvancedMonorail(speed, weight, bodyColor, wheelColor, tireColor, - addWheelsNumb, secondCabineColor, secondCabine, magniteRail); + addWheelsNumb, additionalColor, secondCabine, magniteRail); } } public override void DrawTransport(Graphics g) @@ -33,8 +33,8 @@ namespace Monorail.DrawningObjects { return; } - Pen additionalPen = new(advancedMonorail.TireColor); - Brush additionalBrush = new SolidBrush(advancedMonorail.WheelColor); + Pen additionalPen = new(advancedMonorail.AdditionalColor); + Brush additionalBrush = new SolidBrush(advancedMonorail.AdditionalColor); //3 колеса if (advancedMonorail.AddWheelsNumb >= 3) diff --git a/Monorail/Monorail/EntityAdvancedMonorail.cs b/Monorail/Monorail/EntityAdvancedMonorail.cs index 21e670b..f6a80ea 100644 --- a/Monorail/Monorail/EntityAdvancedMonorail.cs +++ b/Monorail/Monorail/EntityAdvancedMonorail.cs @@ -9,7 +9,7 @@ namespace Monorail.Entities { public class EntityAdvancedMonorail : EntityMonorail { - public Color additionalColor { get; private set; } + public Color AdditionalColor { get; private set; } public int AddWheelsNumb { get; private set; } public bool SecondCabine { get; private set; } @@ -18,7 +18,7 @@ namespace Monorail.Entities public EntityAdvancedMonorail(int speed, double weight, Color bodyColor, Color wheelColor, Color tireColor, int addWheelsNumb, Color secondCabineColor, bool secondCabine, bool magniteRail) : base(speed, weight, bodyColor, wheelColor, tireColor) { - additionalColor = secondCabineColor; + AdditionalColor = secondCabineColor; AddWheelsNumb = addWheelsNumb; SecondCabine = secondCabine; MagniteRail = magniteRail; diff --git a/Monorail/Monorail/MoveToEdge.cs b/Monorail/Monorail/MoveToEdge.cs index 8108d85..895a142 100644 --- a/Monorail/Monorail/MoveToEdge.cs +++ b/Monorail/Monorail/MoveToEdge.cs @@ -27,7 +27,7 @@ namespace Monorail.MovementStrategy { return; } - var diffX = objParams.RightBorder - (FieldWidth); + var diffX = objParams.RightBorder - FieldWidth; if (Math.Abs(diffX) > GetStep()) { if (diffX < 0) @@ -35,7 +35,7 @@ namespace Monorail.MovementStrategy MoveRight(); } } - var diffY = objParams.DownBorder - (FieldHeight-1); + var diffY = objParams.DownBorder - FieldHeight; if (Math.Abs(diffY) > GetStep()) { if (diffY < 0)