From daa6d8c91f4be46654fba568958efb8685e9072e Mon Sep 17 00:00:00 2001 From: gg12 darfren Date: Sun, 15 Oct 2023 19:12:56 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=BE=D0=B2=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D1=83=D1=8E=D1=89=D0=B8?= =?UTF-8?q?=D1=85=20=D0=BB=D0=B0=D0=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...{DrawningAdvancedMonorail.cs => DrawningLocomotive.cs} | 8 ++++---- .../{EntityAdvancedMonorail.cs => EntityLocomotive.cs} | 4 ++-- Monorail/Monorail/MonorailForm.cs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) rename Monorail/Monorail/{DrawningAdvancedMonorail.cs => DrawningLocomotive.cs} (89%) rename Monorail/Monorail/{EntityAdvancedMonorail.cs => EntityLocomotive.cs} (83%) diff --git a/Monorail/Monorail/DrawningAdvancedMonorail.cs b/Monorail/Monorail/DrawningLocomotive.cs similarity index 89% rename from Monorail/Monorail/DrawningAdvancedMonorail.cs rename to Monorail/Monorail/DrawningLocomotive.cs index c5e618a..481ea87 100644 --- a/Monorail/Monorail/DrawningAdvancedMonorail.cs +++ b/Monorail/Monorail/DrawningLocomotive.cs @@ -8,14 +8,14 @@ using Monorail.Entities; namespace Monorail.DrawningObjects { - public class DrawningAdvancedMonorail : DrawningMonorail + public class DrawningLocomotive : DrawningMonorail { - public DrawningAdvancedMonorail(int speed, double weight, Color bodyColor, Color wheelColor, Color tireColor, int width, int height, int addWheelsNumb, + public DrawningLocomotive(int speed, double weight, Color bodyColor, Color wheelColor, Color tireColor, int width, int height, int addWheelsNumb, 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, + EntityMonorail = new EntityLocomotive(speed, weight, bodyColor, wheelColor, tireColor, addWheelsNumb, additionalColor, secondCabine, magniteRail); } } @@ -29,7 +29,7 @@ namespace Monorail.DrawningObjects Brush windowBrush = new SolidBrush(Color.White); if (EntityMonorail == null) return; - if(EntityMonorail is not EntityAdvancedMonorail advancedMonorail) + if(EntityMonorail is not EntityLocomotive advancedMonorail) { return; } diff --git a/Monorail/Monorail/EntityAdvancedMonorail.cs b/Monorail/Monorail/EntityLocomotive.cs similarity index 83% rename from Monorail/Monorail/EntityAdvancedMonorail.cs rename to Monorail/Monorail/EntityLocomotive.cs index f6a80ea..46bca30 100644 --- a/Monorail/Monorail/EntityAdvancedMonorail.cs +++ b/Monorail/Monorail/EntityLocomotive.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace Monorail.Entities { - public class EntityAdvancedMonorail : EntityMonorail + public class EntityLocomotive : EntityMonorail { public Color AdditionalColor { get; private set; } public int AddWheelsNumb { get; private set; } @@ -15,7 +15,7 @@ namespace Monorail.Entities public bool SecondCabine { get; private set; } public bool MagniteRail { get; private set; } - public EntityAdvancedMonorail(int speed, double weight, Color bodyColor, Color wheelColor, + public EntityLocomotive(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; diff --git a/Monorail/Monorail/MonorailForm.cs b/Monorail/Monorail/MonorailForm.cs index 8b5ef2f..57ecf45 100644 --- a/Monorail/Monorail/MonorailForm.cs +++ b/Monorail/Monorail/MonorailForm.cs @@ -92,7 +92,7 @@ namespace Monorail if (dialog.ShowDialog() == DialogResult.OK) additionalColor = dialog.Color; int addWheelNumb = random.Next(3, 5); - _drawningMonorail = new DrawningAdvancedMonorail(random.Next(100, 300), random.Next(1000, 3000), + _drawningMonorail = new DrawningLocomotive(random.Next(100, 300), random.Next(1000, 3000), bodyColor, wheelColor, tireColor, pictureBoxMonorail.Width, pictureBoxMonorail.Height, addWheelNumb, additionalColor, random.Next(0, 2) > 0, random.Next(0, 2) > 0);