удаление лишних ресурсов

LocomotivesAdvanced/LocomotivesAdvanced/Direction.cs

@@ -0,0 +1,25 @@
+namespace WarmlyLocomotove
+{
+    /// <summary>
+    /// Перечисление направлений перемещения
+    /// </summary>
+    internal enum Direction
+    {
+        /// <summary>
+        /// вверх
+        /// </summary>
+        Up = 1,
+        /// <summary>
+        /// вниз
+        /// </summary>
+        Down = 2,
+        /// <summary>
+        /// влево
+        /// </summary>
+        Left = 3,
+        /// <summary>
+        /// вправо
+        /// </summary>
+        Right = 4
+    }
+}

LocomotivesAdvanced/LocomotivesAdvanced/DrawningLocomotive.cs

@@ -0,0 +1,192 @@
+namespace WarmlyLocomotove
+{
+    /// <summary>
+    /// Класс, отвечающий за отрисовку объекта-сущности
+    /// </summary>
+    internal class DrawningLocomotive
+    {
+        /// <summary>
+        /// Класс-сущность
+        /// </summary>
+        public EntityLocomotive Locomotive { get; private set; }
+        /// <summary>
+        /// Класс отрисовки колёс
+        /// </summary>
+        public DrawningWheels Wheels;
+        /// <summary>
+        /// Левая координата отрисовки локомотива
+        /// </summary>
+        private float _startPosX;
+        /// <summary>
+        /// Верхняя координата отрисовки локомотива
+        /// </summary>
+        private float _startPosY;
+        /// <summary>
+        /// Ширина окна отрисовки
+        /// </summary>
+        private int? _pictureWidth;
+        /// <summary>
+        /// Высота окна отрисовки
+        /// </summary>
+        private int? _pictureHeight;
+        /// <summary>
+        /// Ширина локомотива
+        /// </summary>
+        protected readonly int _locomotiveWidth = 160;
+        /// <summary>
+        /// Высота локомотива
+        /// </summary>
+        protected readonly int _locomotiveHeight = 80;
+        /// <summary>
+        /// Инициализация свойств объекта-сущности
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        public void Init(int speed, float weight, Color bodyColor)
+        {
+            Locomotive = new EntityLocomotive();
+            Locomotive.Init(speed, weight, bodyColor);
+            Wheels = new DrawningWheels();
+        }
+        /// <summary>
+        /// Установка начальной позиции локомотива
+        /// </summary>
+        /// <param name="x">Левая координата</param>
+        /// <param name="y">Правая координата</param>
+        /// <param name="width">Ширина</param>
+        /// <param name="height">Высота</param>
+        public void SetPosition(int x, int y, int width, int height)
+        {
+            if (x < 0 || y < 0 || x + _locomotiveWidth > width || y + _locomotiveHeight > height)
+            {
+                return;
+            }
+            _startPosX = x;
+            _startPosY = y;
+            _pictureWidth = width;
+            _pictureHeight = height;
+        }
+        /// <summary>
+        /// Перемещение локомотива в зависимости от направления
+        /// </summary>
+        /// <param name="direction">Направление</param>
+        public void MoveLocomotive(Direction direction)
+        {
+            if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
+            {
+                return;
+            }
+            if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
+            {
+                return;
+            }
+            switch (direction)
+            {
+                //вправо
+                case Direction.Right:
+                    if (_startPosX + _locomotiveWidth + Locomotive.Step < _pictureWidth)
+                    {
+                        _startPosX += Locomotive.Step;
+                    }
+                    break;
+                //влево
+                case Direction.Left:
+                    if (_startPosX >= Locomotive.Step)
+                    {
+                        _startPosX -= Locomotive.Step;
+                    }
+                    break;
+                //вверх
+                case Direction.Up:
+                    if (_startPosY >= Locomotive.Step)
+                    {
+                        _startPosY -= Locomotive.Step;
+                    }
+                    break;
+                //вниз
+                case Direction.Down:
+                    if (_startPosY + _locomotiveHeight + Locomotive.Step < _pictureHeight)
+                    {
+                        _startPosY += Locomotive.Step;
+                    }
+                    break;
+            }
+        }
+        /// <summary>
+        /// Метод отрисовки локомотива
+        /// </summary>
+        /// <param name="g">Графика</param>
+        public void DrawTransport(Graphics g)
+        {
+            if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
+            {
+                return;
+            }
+            //кузов
+            Pen penBodyColor = new Pen(Locomotive?.BodyColor ?? Color.Black);
+            for (int i = (int)_startPosX + 10; i <= _startPosX + 20; i++)
+            {
+                g.DrawLine(penBodyColor, _startPosX + 20, _startPosY, i, _startPosY + 20);
+            }
+            Brush brBodyColor = new SolidBrush(Locomotive?.BodyColor ?? Color.Black);
+            g.FillRectangle(brBodyColor, _startPosX + 20, _startPosY, 130, 20);//верхняя часть
+            g.FillRectangle(brBodyColor, _startPosX + 10, _startPosY + 20, 140, 20);//нижняя часть
+            //переход
+            Brush brBlack = new SolidBrush(Color.Black);
+            g.FillRectangle(brBlack, _startPosX + 150, _startPosY + 5, 10, 30);
+            Pen pen = new(Color.Black);
+            //границы локомотива
+            g.DrawLine(pen, _startPosX + 20, _startPosY, _startPosX + 10, _startPosY + 20);
+            g.DrawLine(pen, _startPosX, _startPosY + 50, _startPosX + 10, _startPosY + 50);
+            for (int i = (int)_startPosX + 10; i <= (int)_startPosX + 20; i++)
+            {
+                g.DrawLine(pen, i, _startPosY + 40, i - 10, _startPosY + 50);
+            }
+            for (int i = (int)_startPosX + 140; i <= (int)_startPosX + 150; i++)
+            {
+                g.DrawLine(pen, i, _startPosY + 40, i + 10, _startPosY + 50);
+            }
+            g.DrawRectangle(pen, _startPosX + 10, _startPosY + 20, 140, 20);
+            g.DrawLine(pen, _startPosX + 20, _startPosY, _startPosX + 150, _startPosY);
+            g.DrawLine(pen, _startPosX + 150, _startPosY, _startPosX + 150, _startPosY + 20);
+            //окна
+            Brush brWhite = new SolidBrush(Color.White);
+            g.FillRectangle(brWhite, _startPosX + 25, _startPosY + 5, 10, 10);
+            g.DrawRectangle(pen, _startPosX + 25, _startPosY + 5, 10, 10);
+            g.FillRectangle(brWhite, _startPosX + 40, _startPosY + 5, 10, 10);
+            g.DrawRectangle(pen, _startPosX + 40, _startPosY + 5, 10, 10);
+            g.FillRectangle(brWhite, _startPosX + 130, _startPosY + 5, 10, 10);
+            g.DrawRectangle(pen, _startPosX + 130, _startPosY + 5, 10, 10);
+            //дверь
+            g.FillRectangle(brBodyColor, _startPosX + 60, _startPosY + 10, 15, 25);
+            g.DrawRectangle(pen, _startPosX + 60, _startPosY + 10, 15, 25);
+            //колёса
+            Wheels.DrawWheels(g, _startPosX, _startPosY, Color.Black);
+        }
+        /// <summary>
+        /// Метод перерисовки при изменении границ рисунка
+        /// </summary>
+        /// <param name="width">Новая ширина</param>
+        /// <param name="height">Новая высота</param>
+        public void ChangeBorders(int width, int height)
+        {
+            _pictureWidth = width;
+            _pictureHeight = height;
+            if (_pictureWidth <= _locomotiveWidth || _pictureHeight <= _locomotiveHeight)
+            {
+                _pictureWidth = null;
+                _pictureHeight = null;
+                return;
+            }
+            if (_startPosX + _locomotiveWidth > _pictureWidth)
+            {
+                _startPosX = _pictureWidth.Value - _locomotiveWidth;
+            }
+            if (_startPosY + _locomotiveHeight > _pictureHeight)
+            {
+                _startPosY = _pictureHeight.Value - _locomotiveHeight;
+            }
+        }
+    }
+}

LocomotivesAdvanced/LocomotivesAdvanced/DrawningWheels.cs

@@ -0,0 +1,44 @@
+namespace WarmlyLocomotove
+{
+    internal class DrawningWheels
+    {
+        private WheelsNumber wheelsNumber;
+
+        public int WheelsNum
+        {
+            set
+            {
+                if (value < 2 || value > 4)
+                {
+                    wheelsNumber = (WheelsNumber)2;
+                }
+                else
+                {
+                    wheelsNumber = (WheelsNumber)value;
+                }
+            }
+        }
+        public void DrawWheels(Graphics g, float startPosX, float startPosY, Color wheelsColor)
+        {
+            Pen pen = new(wheelsColor);
+            switch (wheelsNumber)
+            {
+                case WheelsNumber.Two:
+                    g.DrawEllipse(pen, startPosX + 20, startPosY + 40, 20, 15);
+                    g.DrawEllipse(pen, startPosX + 120, startPosY + 40, 20, 15);
+                    break;
+                case WheelsNumber.Three:
+                    g.DrawEllipse(pen, startPosX + 20, startPosY + 40, 20, 15);
+                    g.DrawEllipse(pen, startPosX + 90, startPosY + 40, 20, 15);
+                    g.DrawEllipse(pen, startPosX + 120, startPosY + 40, 20, 15);
+                    break;
+                case WheelsNumber.Four:
+                    g.DrawEllipse(pen, startPosX + 20, startPosY + 40, 20, 15);
+                    g.DrawEllipse(pen, startPosX + 50, startPosY + 40, 20, 15);
+                    g.DrawEllipse(pen, startPosX + 90, startPosY + 40, 20, 15);
+                    g.DrawEllipse(pen, startPosX + 120, startPosY + 40, 20, 15);
+                    break;
+            }
+        }
+    }
+}

LocomotivesAdvanced/LocomotivesAdvanced/EntityLocomotive.cs

@@ -0,0 +1,38 @@
+namespace WarmlyLocomotove
+{
+    /// <summary>
+    /// Класс-сущность локомотив
+    /// </summary>
+    internal class EntityLocomotive
+    {
+        /// <summary>
+        /// Скорость
+        /// </summary>
+        public int Speed { get; private set; }
+        /// <summary>
+        /// Вес
+        /// </summary>
+        public float Weight { get; private set; }
+        /// <summary>
+        /// Цвет кузова
+        /// </summary>
+        public Color BodyColor { get; private set; }
+        /// <summary>
+        /// Шаг перемещения
+        /// </summary>
+        public float Step => Speed * 100 / Weight;
+        /// <summary>
+        /// Инициализация полей объекта-класса локомотива
+        /// </summary>
+        /// <param name="speed">скорость</param>
+        /// <param name="weight">вес</param>
+        /// <param name="bodyColor">цвет кузова</param>
+        public void Init(int speed, float weight, Color bodyColor)
+        {
+            Random rnd = new();
+            Speed = speed <= 0 ? rnd.Next(50, 150) : speed;
+            Weight = weight <= 0 ? rnd.Next(40, 70) : weight;
+            BodyColor = bodyColor;
+        }
+    }
+}

LocomotivesAdvanced/LocomotivesAdvanced/Form1.Designer.cs

@@ -1,38 +0,0 @@
-namespace WarmlyLocomotive
-{
-    partial class Form1 : Form
-    {
-        /// <summary>
-        ///  Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        ///  Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        ///  Required method for Designer support - do not modify
-        ///  the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Text = "Form1";
-        }
-
-        #endregion
-    }
-}

LocomotivesAdvanced/LocomotivesAdvanced/Form1.cs

@@ -1,10 +0,0 @@
-namespace WarmlyLocomotive
-{
-    public partial class Form1 : Form
-    {
-        public Form1()
-        {
-            InitializeComponent();
-        }
-    }
-}

LocomotivesAdvanced/LocomotivesAdvanced/FormLocomotive.Designer.cs

@@ -0,0 +1,223 @@
+namespace WarmlyLocomotove
+{
+    partial class FormLocomotive
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.pictureBoxLocomotive = new System.Windows.Forms.PictureBox();
+            this.statusStrip = new System.Windows.Forms.StatusStrip();
+            this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
+            this.buttonCreate = new System.Windows.Forms.Button();
+            this.buttonRight = new System.Windows.Forms.Button();
+            this.buttonLeft = new System.Windows.Forms.Button();
+            this.buttonDown = new System.Windows.Forms.Button();
+            this.buttonUp = new System.Windows.Forms.Button();
+            this.numericUpDownWheelsNumber = new System.Windows.Forms.NumericUpDown();
+            this.labelWheelsNumber = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotive)).BeginInit();
+            this.statusStrip.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWheelsNumber)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // pictureBoxLocomotive
+            // 
+            this.pictureBoxLocomotive.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pictureBoxLocomotive.Location = new System.Drawing.Point(0, 0);
+            this.pictureBoxLocomotive.MinimumSize = new System.Drawing.Size(1, 1);
+            this.pictureBoxLocomotive.Name = "pictureBoxLocomotive";
+            this.pictureBoxLocomotive.Size = new System.Drawing.Size(800, 450);
+            this.pictureBoxLocomotive.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+            this.pictureBoxLocomotive.TabIndex = 0;
+            this.pictureBoxLocomotive.TabStop = false;
+            this.pictureBoxLocomotive.Resize += new System.EventHandler(this.PictureBoxLocomotive_Resize);
+            // 
+            // statusStrip
+            // 
+            this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripStatusLabelSpeed,
+            this.toolStripStatusLabelWeight,
+            this.toolStripStatusLabelBodyColor});
+            this.statusStrip.Location = new System.Drawing.Point(0, 428);
+            this.statusStrip.Name = "statusStrip";
+            this.statusStrip.Size = new System.Drawing.Size(800, 22);
+            this.statusStrip.TabIndex = 1;
+            this.statusStrip.Text = "statusStrip1";
+            // 
+            // toolStripStatusLabelSpeed
+            // 
+            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
+            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(65, 17);
+            this.toolStripStatusLabelSpeed.Text = "Скорость: ";
+            // 
+            // toolStripStatusLabelWeight
+            // 
+            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
+            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(32, 17);
+            this.toolStripStatusLabelWeight.Text = "Вес: ";
+            // 
+            // toolStripStatusLabelBodyColor
+            // 
+            this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
+            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(39, 17);
+            this.toolStripStatusLabelBodyColor.Text = "Цвет: ";
+            // 
+            // buttonCreate
+            // 
+            this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.buttonCreate.Location = new System.Drawing.Point(12, 395);
+            this.buttonCreate.Name = "buttonCreate";
+            this.buttonCreate.Size = new System.Drawing.Size(90, 30);
+            this.buttonCreate.TabIndex = 2;
+            this.buttonCreate.Text = "Создать";
+            this.buttonCreate.UseVisualStyleBackColor = true;
+            this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click);
+            // 
+            // buttonRight
+            // 
+            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonRight.BackgroundImage = global::WarmlyLocomotive.Properties.Resources.ArrowRight;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonRight.Location = new System.Drawing.Point(758, 395);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(30, 30);
+            this.buttonRight.TabIndex = 3;
+            this.buttonRight.UseVisualStyleBackColor = true;
+            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonLeft
+            // 
+            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonLeft.BackgroundImage = global::WarmlyLocomotive.Properties.Resources.ArrowLeft;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(686, 395);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
+            this.buttonLeft.TabIndex = 4;
+            this.buttonLeft.UseVisualStyleBackColor = true;
+            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonDown
+            // 
+            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonDown.BackgroundImage = global::WarmlyLocomotive.Properties.Resources.ArrowDown;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonDown.Location = new System.Drawing.Point(722, 395);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(30, 30);
+            this.buttonDown.TabIndex = 5;
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonUp
+            // 
+            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonUp.BackgroundImage = global::WarmlyLocomotive.Properties.Resources.ArrowUp;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUp.Location = new System.Drawing.Point(722, 359);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(30, 30);
+            this.buttonUp.TabIndex = 6;
+            this.buttonUp.UseVisualStyleBackColor = true;
+            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // numericUpDownWheelsNumber
+            // 
+            this.numericUpDownWheelsNumber.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.numericUpDownWheelsNumber.Location = new System.Drawing.Point(651, 402);
+            this.numericUpDownWheelsNumber.Maximum = new decimal(new int[] {
+            4,
+            0,
+            0,
+            0});
+            this.numericUpDownWheelsNumber.Minimum = new decimal(new int[] {
+            2,
+            0,
+            0,
+            0});
+            this.numericUpDownWheelsNumber.Name = "numericUpDownWheelsNumber";
+            this.numericUpDownWheelsNumber.ReadOnly = true;
+            this.numericUpDownWheelsNumber.Size = new System.Drawing.Size(29, 23);
+            this.numericUpDownWheelsNumber.TabIndex = 7;
+            this.numericUpDownWheelsNumber.Value = new decimal(new int[] {
+            2,
+            0,
+            0,
+            0});
+            // 
+            // labelWheelsNumber
+            // 
+            this.labelWheelsNumber.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.labelWheelsNumber.AutoSize = true;
+            this.labelWheelsNumber.Location = new System.Drawing.Point(565, 404);
+            this.labelWheelsNumber.Name = "labelWheelsNumber";
+            this.labelWheelsNumber.Size = new System.Drawing.Size(80, 15);
+            this.labelWheelsNumber.TabIndex = 8;
+            this.labelWheelsNumber.Text = "Число колёс:";
+            // 
+            // FormLocomotive
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.labelWheelsNumber);
+            this.Controls.Add(this.numericUpDownWheelsNumber);
+            this.Controls.Add(this.buttonUp);
+            this.Controls.Add(this.buttonDown);
+            this.Controls.Add(this.buttonLeft);
+            this.Controls.Add(this.buttonRight);
+            this.Controls.Add(this.buttonCreate);
+            this.Controls.Add(this.statusStrip);
+            this.Controls.Add(this.pictureBoxLocomotive);
+            this.Name = "FormLocomotive";
+            this.Text = "Локомотив";
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotive)).EndInit();
+            this.statusStrip.ResumeLayout(false);
+            this.statusStrip.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWheelsNumber)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private PictureBox pictureBoxLocomotive;
+        private StatusStrip statusStrip;
+        private ToolStripStatusLabel toolStripStatusLabelSpeed;
+        private ToolStripStatusLabel toolStripStatusLabelWeight;
+        private ToolStripStatusLabel toolStripStatusLabelBodyColor;
+        private Button buttonCreate;
+        private Button buttonRight;
+        private Button buttonLeft;
+        private Button buttonDown;
+        private Button buttonUp;
+        private NumericUpDown numericUpDownWheelsNumber;
+        private Label labelWheelsNumber;
+    }
+}

LocomotivesAdvanced/LocomotivesAdvanced/FormLocomotive.cs

@@ -0,0 +1,78 @@
+namespace WarmlyLocomotove
+{
+    public partial class FormLocomotive : Form
+    {
+        /// <summary>
+        /// Объект от класса отрисовки локомотива
+        /// </summary>
+        private DrawningLocomotive _locomotive;
+
+        public FormLocomotive()
+        {
+            InitializeComponent();
+        }
+        /// <summary>
+        /// Метод отрисовки локомотива
+        /// </summary>
+        private void Draw()
+        {
+            Bitmap bmp = new(pictureBoxLocomotive.Width, pictureBoxLocomotive.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _locomotive?.DrawTransport(gr);
+            pictureBoxLocomotive.Image = bmp;
+        }
+        /// <summary>
+        /// Метод обработки нажатия на кнопку "Создать"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreate_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            _locomotive = new DrawningLocomotive();
+            _locomotive.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            _locomotive.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxLocomotive.Width, pictureBoxLocomotive.Height);
+            toolStripStatusLabelSpeed.Text = $"Скорость: {_locomotive.Locomotive.Speed}";
+            toolStripStatusLabelWeight.Text = $"Вес: {_locomotive.Locomotive.Weight}";
+            toolStripStatusLabelBodyColor.Text = $"Цвет: {_locomotive.Locomotive.BodyColor.Name}";
+            _locomotive.Wheels.WheelsNum = (int)numericUpDownWheelsNumber.Value;
+            Draw();
+        }
+        /// <summary>
+        /// Метод обработки нажатия на кнопки перемещения
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            //получаем имя кнопки
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            switch (name)
+            {
+                case "buttonUp":
+                    _locomotive?.MoveLocomotive(Direction.Up);
+                    break;
+                case "buttonDown":
+                    _locomotive?.MoveLocomotive(Direction.Down);
+                    break;
+                case "buttonLeft":
+                    _locomotive?.MoveLocomotive(Direction.Left);
+                    break;
+                case "buttonRight":
+                    _locomotive?.MoveLocomotive(Direction.Right);
+                    break;
+            }
+            Draw();
+        }
+        /// <summary>
+        /// Изменение размеров формы
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PictureBoxLocomotive_Resize(object sender, EventArgs e)
+        {
+            _locomotive?.ChangeBorders(pictureBoxLocomotive.Width, pictureBoxLocomotive.Height);
+            Draw();
+        }
+    }
+}

LocomotivesAdvanced/LocomotivesAdvanced/FormLocomotive.resx

@@ -0,0 +1,63 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>

LocomotivesAdvanced/LocomotivesAdvanced/Program.cs

@@ -1,17 +1,14 @@
-namespace WarmlyLocomotive
+namespace WarmlyLocomotove
 {
     internal static class Program
     {
-        /// <summary>
-        ///  The main entry point for the application.
-        /// </summary>
         [STAThread]
         static void Main()
         {
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new Form1());
+            Application.Run(new FormLocomotive());
         }
     }
 }

LocomotivesAdvanced/LocomotivesAdvanced/Properties/Resources.Designer.cs

@@ -0,0 +1,103 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Этот код создан программой.
+//     Исполняемая версия:4.0.30319.42000
+//
+//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+//     повторной генерации кода.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WarmlyLocomotive.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Класс ресурса со строгой типизацией для поиска локализованных строк и т.д.
+    /// </summary>
+    // Этот класс создан автоматически классом StronglyTypedResourceBuilder
+    // с помощью такого средства, как ResGen или Visual Studio.
+    // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen
+    // с параметром /str или перестройте свой проект VS.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Возвращает кэшированный экземпляр ResourceManager, использованный этим классом.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WarmlyLocomotive.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Перезаписывает свойство CurrentUICulture текущего потока для всех
+        ///   обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ArrowDown {
+            get {
+                object obj = ResourceManager.GetObject("ArrowDown", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ArrowLeft {
+            get {
+                object obj = ResourceManager.GetObject("ArrowLeft", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ArrowRight {
+            get {
+                object obj = ResourceManager.GetObject("ArrowRight", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ArrowUp {
+            get {
+                object obj = ResourceManager.GetObject("ArrowUp", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}

LocomotivesAdvanced/LocomotivesAdvanced/Properties/Resources.resx

@@ -117,4 +117,17 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="ArrowDown" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ArrowDown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ArrowLeft" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ArrowLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ArrowRight" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ArrowRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ArrowUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ArrowUp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

LocomotivesAdvanced/LocomotivesAdvanced/WarmlyLocomotive.csproj

@@ -8,4 +8,23 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Resources\" />
+  </ItemGroup>
+
 </Project>

LocomotivesAdvanced/LocomotivesAdvanced/WheelsNumber.cs

@@ -0,0 +1,12 @@
+namespace WarmlyLocomotove
+{
+    /// <summary>
+    /// Число колёс
+    /// </summary>
+    internal enum WheelsNumber
+    {
+        Two = 2,
+        Three = 3,
+        Four = 4
+    }
+}