diff --git a/AirFighter/AirFighter/DrawingModernAirFighter.cs b/AirFighter/AirFighter/DrawingModernAirFighter.cs index 019c9f2..6dd6c85 100644 --- a/AirFighter/AirFighter/DrawingModernAirFighter.cs +++ b/AirFighter/AirFighter/DrawingModernAirFighter.cs @@ -8,11 +8,11 @@ namespace AirFighter { internal class DrawingModernAirFighter : DrawingAirFighter { - public DrawingModernAirFighter(int speed, float weight, Color bodyColor, Color dopColor, bool dopWings, bool rockets, bool sportLine) : + public DrawingModernAirFighter(int speed, float weight, Color bodyColor, Color dopColor, bool dopWings, bool rockets) : base(speed, weight, bodyColor, 195, 166) { AirFighter = new EntityModernAirFighter(speed, weight, bodyColor, dopColor, dopWings, - rockets, sportLine); + rockets); } public override void DrawTransport(Graphics g) { diff --git a/AirFighter/AirFighter/EntityModernAirFighter.cs b/AirFighter/AirFighter/EntityModernAirFighter.cs index 4845793..52763bf 100644 --- a/AirFighter/AirFighter/EntityModernAirFighter.cs +++ b/AirFighter/AirFighter/EntityModernAirFighter.cs @@ -10,40 +10,18 @@ namespace AirFighter { internal class EntityModernAirFighter : EntityAirFighter { - /// - /// Дополнительный цвет - /// public Color DopColor { get; private set; } - /// - /// Признак наличия обвеса - /// public bool DopWings { get; private set; } - /// - /// Признак наличия антикрыла - /// public bool Rockets { get; private set; } - /// - /// Признак наличия гоночной полосы - /// - public bool SportLine { get; private set; } - /// - /// Инициализация свойств - /// - /// Скорость - /// Вес автомобиля - /// Цвет кузова - /// Дополнительный цвет - /// Признак наличия обвеса - /// Признак наличия антикрыла - /// Признак наличия гоночной полосы + + public EntityModernAirFighter(int speed, float weight, Color bodyColor, Color - dopColor, bool dopWings, bool rockets, bool sportLine) : + dopColor, bool dopWings, bool rockets) : base(speed, weight, bodyColor) { DopColor = dopColor; DopWings = dopWings; Rockets = rockets; - SportLine = sportLine; } } } diff --git a/AirFighter/AirFighter/FormAirFighter.Designer.cs b/AirFighter/AirFighter/FormAirFighter.Designer.cs index d76f966..8bf5034 100644 --- a/AirFighter/AirFighter/FormAirFighter.Designer.cs +++ b/AirFighter/AirFighter/FormAirFighter.Designer.cs @@ -50,7 +50,7 @@ this.CreateButton.Name = "CreateButton"; this.CreateButton.Size = new System.Drawing.Size(94, 29); this.CreateButton.TabIndex = 0; - this.CreateButton.Text = "create"; + this.CreateButton.Text = "создание"; this.CreateButton.UseVisualStyleBackColor = true; this.CreateButton.Click += new System.EventHandler(this.CreateButton_Click); // @@ -155,7 +155,7 @@ this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(148, 29); this.button1.TabIndex = 7; - this.button1.Text = "create modern"; + this.button1.Text = "модификация"; this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.CreateModernButton_Click); // diff --git a/AirFighter/AirFighter/FormAirFighter.cs b/AirFighter/AirFighter/FormAirFighter.cs index ea34367..c5b8019 100644 --- a/AirFighter/AirFighter/FormAirFighter.cs +++ b/AirFighter/AirFighter/FormAirFighter.cs @@ -36,8 +36,7 @@ namespace AirFighter _airFighter = new DrawingModernAirFighter(rnd.Next(100, 300), rnd.Next(1000,2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0,256)), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0,256)), - Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0,2)), - Convert.ToBoolean(rnd.Next(0, 2))); + Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0,2))); _airFighter.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBox.Width, pictureBox.Height); diff --git a/AirFighter/AirFighter/FormMap.cs b/AirFighter/AirFighter/FormMap.cs index 42ca010..e2d4fcb 100644 --- a/AirFighter/AirFighter/FormMap.cs +++ b/AirFighter/AirFighter/FormMap.cs @@ -48,8 +48,7 @@ namespace AirFighter _airFighter = new DrawingModernAirFighter(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), - Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), - Convert.ToBoolean(rnd.Next(0, 2))); + Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); SetData(_airFighter);