From 9dd23a69957aacf6a6fd1d09b944b9500bdae1d1 Mon Sep 17 00:00:00 2001
From: Almaz <79022113685@mail.ru>
Date: Tue, 9 Apr 2024 08:46:46 +0400
Subject: [PATCH 1/6] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D1=8D=D0=BB=D0=B5=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=20"?=
 =?UTF-8?q?=D0=BA=D1=80=D0=B5=D0=B9=D1=81=D0=B5=D1=80",=20=D0=BD=D0=BE=20?=
 =?UTF-8?q?=D0=B1=D0=B5=D0=B7=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD?=
 =?UTF-8?q?=D0=BE=D1=81=D1=82=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=B3=D0=B0=D1=82=D1=8C=D1=81=D1=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectCruiser/DirectionType.cs           |  31 +++
 .../ProjectCruiser/DrawingCruiser.cs          | 209 ++++++++++++++++++
 .../ProjectCruiser/EntityCruiser.cs           |  69 ++++++
 .../ProjectCruiser/Form1.Designer.cs          |  45 ----
 ProjectCruiser/ProjectCruiser/Form1.cs        |  10 -
 .../ProjectCruiser/FormCruiser.Designer.cs    | 130 +++++++++++
 ProjectCruiser/ProjectCruiser/FormCruiser.cs  |  34 +++
 .../{Form1.resx => FormCruiser.resx}          |   0
 ProjectCruiser/ProjectCruiser/Program.cs      |   2 +-
 .../ProjectCruiser/ProjectCruiser.csproj      |  15 ++
 .../Properties/Resources.Designer.cs          | 103 +++++++++
 .../ProjectCruiser/Properties/Resources.resx  | 133 +++++++++++
 .../Properties/Resources/arrowDown.png        | Bin 0 -> 6633 bytes
 .../Properties/Resources/arrowLeft.png        | Bin 0 -> 5878 bytes
 .../Properties/Resources/arrowRight.png       | Bin 0 -> 5832 bytes
 .../Properties/Resources/arrowUp.png          | Bin 0 -> 5884 bytes
 16 files changed, 725 insertions(+), 56 deletions(-)
 create mode 100644 ProjectCruiser/ProjectCruiser/DirectionType.cs
 create mode 100644 ProjectCruiser/ProjectCruiser/DrawingCruiser.cs
 create mode 100644 ProjectCruiser/ProjectCruiser/EntityCruiser.cs
 delete mode 100644 ProjectCruiser/ProjectCruiser/Form1.Designer.cs
 delete mode 100644 ProjectCruiser/ProjectCruiser/Form1.cs
 create mode 100644 ProjectCruiser/ProjectCruiser/FormCruiser.Designer.cs
 create mode 100644 ProjectCruiser/ProjectCruiser/FormCruiser.cs
 rename ProjectCruiser/ProjectCruiser/{Form1.resx => FormCruiser.resx} (100%)
 create mode 100644 ProjectCruiser/ProjectCruiser/Properties/Resources.Designer.cs
 create mode 100644 ProjectCruiser/ProjectCruiser/Properties/Resources.resx
 create mode 100644 ProjectCruiser/ProjectCruiser/Properties/Resources/arrowDown.png
 create mode 100644 ProjectCruiser/ProjectCruiser/Properties/Resources/arrowLeft.png
 create mode 100644 ProjectCruiser/ProjectCruiser/Properties/Resources/arrowRight.png
 create mode 100644 ProjectCruiser/ProjectCruiser/Properties/Resources/arrowUp.png

diff --git a/ProjectCruiser/ProjectCruiser/DirectionType.cs b/ProjectCruiser/ProjectCruiser/DirectionType.cs
new file mode 100644
index 0000000..4cdd1e9
--- /dev/null
+++ b/ProjectCruiser/ProjectCruiser/DirectionType.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectCruiser;
+
+/// <summary>
+/// Направление перемещения
+/// </summary>
+    public enum DirectionType
+    {
+    /// <summary>
+    /// Вверх
+    /// </summary>
+    Up = 1, 
+    /// <summary>
+    /// Вниз
+    /// </summary>
+    Down = 2,
+    /// <summary>
+    /// Влева
+    /// </summary>
+    Left = 3,
+    /// <summary>
+    /// Вправо
+    /// </summary>
+    Right = 4
+    }
+
diff --git a/ProjectCruiser/ProjectCruiser/DrawingCruiser.cs b/ProjectCruiser/ProjectCruiser/DrawingCruiser.cs
new file mode 100644
index 0000000..93473bd
--- /dev/null
+++ b/ProjectCruiser/ProjectCruiser/DrawingCruiser.cs
@@ -0,0 +1,209 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectCruiser;
+
+public class DrawingCruiser
+{
+    /// <summary>
+    /// Класс-сущность
+    /// </summary>
+    public EntityCruiser? EntityCruiser { get; private set; }
+    /// <summary>
+    /// Ширина окна
+    /// </summary>
+    private int? _pictureWidth;
+    /// <summary>
+    /// Высота окна
+    /// </summary>
+    private int? _pictureHeight;
+    /// <summary>
+    /// Левая координата прорисовки крейсера
+    /// </summary>
+    private int? _startPosX;
+    /// <summary>
+    /// Верхняя координата прорисовки крейсера
+    /// </summary>
+    private int? _startPosY;
+
+    /// <summary>
+    /// Ширина прорисовки крейсера
+    /// </summary>
+    private readonly int _drawningCruiserWidth = 110;
+    /// <summary>
+    /// Высота прорисовки крейсера
+    /// </summary>
+    private readonly int _drawingCruiserHeight = 60;
+
+    /// <summary>
+    /// Инициализация полей объекта класса крейсера 
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weigth">Вес крейсера</param>
+    /// <param name="bodyColor">Скорость</param>
+    /// <param name="additionalColor">Дополнительный цвет</param>
+    /// <param name="bodyKit">Признак наличия обвеса</param>
+    /// <param name="armor">Признак наличия брони</param>
+    /// <param name="weapon">Признак наличия оружия</param>
+    public void Init(int speed, double weigth, Color bodyColor, Color additionalColor, bool bodyKit, bool armor, bool weapon)
+    {
+        EntityCruiser = new EntityCruiser();
+        EntityCruiser.Init(speed, weigth, bodyColor, additionalColor, bodyKit, armor, weapon);
+        _pictureWidth = null;
+        _pictureHeight = null;
+        _startPosX = null;
+        _startPosY = null;
+    }
+
+    public bool SetPictireSize(int width, int height)
+    {
+        _pictureWidth = width;
+        _pictureHeight = height;
+        return true;
+    }
+
+    public void SetPosition(int x, int y)
+    {
+        if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
+        {
+            return;
+        }
+
+        _startPosX = x;
+        _startPosY = y;
+    }
+
+    public bool MoveTransport(DirectionType direction)
+    {
+        if (EntityCruiser == null || _startPosX.HasValue || _startPosY.HasValue)
+        {
+            return false;
+        }
+
+        switch (direction)
+        {
+            case DirectionType.Left:
+                if (_startPosX.Value - EntityCruiser.Step > 0)
+                {
+                    _startPosX -= (int)EntityCruiser.Step;
+                }
+                return true;
+
+            case DirectionType.Up:
+                if (_startPosY.Value - EntityCruiser.Step > 0)
+                {
+                    _startPosY -= (int)EntityCruiser.Step;
+                }
+                return true;
+            case DirectionType.Right:
+                return true;
+            case DirectionType.Down:
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    public void DrawTransport(Graphics g)
+    {
+        if (EntityCruiser == null || !_startPosX.HasValue || _startPosY.HasValue)
+        {
+            return;
+        }
+
+        Pen pen = new(Color.Black);
+
+        Brush additionalBrush = new SolidBrush(EntityCruiser.AdditionalColor);
+
+        if (EntityCruiser.BodyKit)
+        {
+            g.DrawEllipse(pen, _startPosX.Value + 90, _startPosY.Value, 20, 20);
+            g.DrawEllipse(pen, _startPosX.Value + 90, _startPosY.Value + 40, 20, 20);
+            g.DrawRectangle(pen, _startPosX.Value + 90, _startPosY.Value + 10, 20, 40);
+            g.DrawRectangle(pen, _startPosX.Value + 90, _startPosY.Value, 15, 15);
+            g.DrawRectangle(pen, _startPosX.Value + 90, _startPosY.Value + 45, 15, 15);
+
+            g.FillEllipse(additionalBrush, _startPosX.Value + 90, _startPosY.Value, 20, 20);
+            g.FillEllipse(additionalBrush, _startPosX.Value + 90, _startPosY.Value + 40, 20, 20);
+            g.FillRectangle(additionalBrush, _startPosX.Value + 90, _startPosY.Value + 10, 20, 40);
+            g.FillRectangle(additionalBrush, _startPosX.Value + 90, _startPosY.Value + 1, 15, 15);
+            g.FillRectangle(additionalBrush, _startPosX.Value + 90, _startPosY.Value + 45, 15, 15);
+
+
+            g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value, 20, 20);
+            g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value + 40, 20, 20);
+            g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 10, 20, 40);
+            g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value, 14, 15);
+            g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value + 45, 14, 15);
+
+            g.FillEllipse(additionalBrush, _startPosX.Value, _startPosY.Value, 20, 20);
+            g.FillEllipse(additionalBrush, _startPosX.Value, _startPosY.Value + 40, 20, 20);
+            g.FillRectangle(additionalBrush, _startPosX.Value + 1, _startPosY.Value + 10, 25, 40);
+            g.FillRectangle(additionalBrush, _startPosX.Value + 5, _startPosY.Value + 1, 15, 15);
+            g.FillRectangle(additionalBrush, _startPosX.Value + 5, _startPosY.Value + 45, 15, 15);
+
+            g.DrawRectangle(pen, _startPosX.Value + 35, _startPosY.Value, 39, 15);
+            g.DrawRectangle(pen, _startPosX.Value + 35, _startPosY.Value + 45, 39, 15);
+
+            g.FillRectangle(additionalBrush, _startPosX.Value + 35, _startPosY.Value + 1, 40, 15);
+            g.FillRectangle(additionalBrush, _startPosX.Value + 35, _startPosY.Value + 45, 40, 15);
+
+        }
+
+        g.DrawEllipse(pen, _startPosX.Value + 10, _startPosY.Value + 5, 20, 20);
+        g.DrawEllipse(pen, _startPosX.Value + 10, _startPosY.Value + 35, 20, 20);
+        g.DrawEllipse(pen, _startPosX.Value + 80, _startPosY.Value + 5, 20, 20);
+        g.DrawEllipse(pen, _startPosX.Value + 80, _startPosY.Value + 35, 20, 20);
+        g.DrawRectangle(pen, _startPosX.Value + 9, _startPosY.Value + 15, 10, 30);
+        g.DrawRectangle(pen, _startPosX.Value + 90, _startPosY.Value + 15, 10, 30);
+        g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 4, 70, 52);
+
+        // задние фары
+        Brush brRed = new SolidBrush(Color.Red);
+        g.FillEllipse(brRed, _startPosX.Value + 10, _startPosY.Value + 5, 20, 20);
+        g.FillEllipse(brRed, _startPosX.Value + 10, _startPosY.Value + 35, 20, 20);
+
+        //передние фары
+        Brush brYellow = new SolidBrush(Color.Yellow);
+        g.FillEllipse(brYellow, _startPosX.Value + 80, _startPosY.Value + 5, 20, 20);
+        g.FillEllipse(brYellow, _startPosX.Value + 80, _startPosY.Value + 35, 20, 20);
+
+        //кузов
+        Brush br = new SolidBrush(EntityCruiser.BodyColor);
+        g.FillRectangle(br, _startPosX.Value + 10, _startPosY.Value + 15, 10, 30);
+        g.FillRectangle(br, _startPosX.Value + 90, _startPosY.Value + 15, 10, 30);
+        g.FillRectangle(br, _startPosX.Value + 20, _startPosY.Value + 5, 70, 50);
+
+        //стекла
+        Brush brBlue = new SolidBrush(Color.LightBlue);
+        g.FillRectangle(brBlue, _startPosX.Value + 70, _startPosY.Value + 10, 5, 40);
+        g.FillRectangle(brBlue, _startPosX.Value + 30, _startPosY.Value + 10, 5, 40);
+        g.FillRectangle(brBlue, _startPosX.Value + 35, _startPosY.Value + 8, 35, 2);
+        g.FillRectangle(brBlue, _startPosX.Value + 35, _startPosY.Value + 51, 35, 2);
+
+        //выделяем рамкой крышу
+        g.DrawRectangle(pen, _startPosX.Value + 35, _startPosY.Value + 10, 35, 40);
+        g.DrawRectangle(pen, _startPosX.Value + 75, _startPosY.Value + 15, 25, 30);
+        g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 15, 15, 30);
+
+        // спортивная линия
+        if (EntityCruiser.Armor)
+        {
+            g.FillRectangle(additionalBrush, _startPosX.Value + 75, _startPosY.Value + 23, 25, 15);
+            g.FillRectangle(additionalBrush, _startPosX.Value + 35, _startPosY.Value + 23, 35, 15);
+            g.FillRectangle(additionalBrush, _startPosX.Value + 10, _startPosY.Value + 23, 20, 15);
+
+        }
+
+        // крыло
+        if (EntityCruiser.Weapon)
+        {
+            g.FillRectangle(additionalBrush, _startPosX.Value, _startPosY.Value + 5, 10, 50);
+            g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 5, 10, 50);
+        }
+
+    }
+}
diff --git a/ProjectCruiser/ProjectCruiser/EntityCruiser.cs b/ProjectCruiser/ProjectCruiser/EntityCruiser.cs
new file mode 100644
index 0000000..8fdcd5d
--- /dev/null
+++ b/ProjectCruiser/ProjectCruiser/EntityCruiser.cs
@@ -0,0 +1,69 @@
+namespace ProjectCruiser
+{
+    /// <summary>
+    /// Класс-сущность "Крейсер" Вариант 18
+    /// </summary>
+    public class EntityCruiser
+    {   
+        /// <summary>
+        /// Скорость
+        /// </summary>
+        public int Speed { get; private set; }
+
+        /// <summary>
+        /// Вес
+        /// </summary>
+        public double Weigth { get; private set; }
+
+        /// <summary>
+        /// Основной цвет
+        /// </summary>
+        public Color BodyColor { get; private set; }
+
+        /// <summary>
+        /// Дополнительный цвет (для опциональных элементов)
+        /// </summary>
+        public Color AdditionalColor { get; private set; }
+
+        /// <summary>
+        /// Признак (опция) наличие обвеса
+        /// </summary>
+        public bool BodyKit { get; private set; }
+
+        /// <summary>
+        /// Признак (опция) брони
+        /// </summary>
+        public bool Armor { get; private set; }
+
+        /// <summary>
+        /// Признак (опция) оружия
+        /// </summary>
+        public bool Weapon { get; private set; }
+
+        /// <summary>
+        /// Шаг перемещения крейсера
+        /// </summary>
+        public double Step => Speed * 100 / Weigth;
+
+        /// <summary>
+        /// Инициализация полей объекта класса крейсера 
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weigth">Вес крейсера</param>
+        /// <param name="bodyColor">Скорость</param>
+        /// <param name="additionalColor">Дополнительный цвет</param>
+        /// <param name="bodyKit">Признак наличия обвеса</param>
+        /// <param name="armor">Признак наличия брони</param>
+        /// <param name="weapon">Признак наличия оружия</param>
+        public void Init(int speed, double weigth, Color bodyColor, Color additionalColor, bool bodyKit, bool armor, bool weapon)
+        {
+            Speed = speed;
+            Weigth = weigth;
+            BodyColor = bodyColor;
+            AdditionalColor = additionalColor;
+            BodyKit = bodyKit;
+            Armor = armor;
+            Weapon = weapon;
+        }
+    }
+}
diff --git a/ProjectCruiser/ProjectCruiser/Form1.Designer.cs b/ProjectCruiser/ProjectCruiser/Form1.Designer.cs
deleted file mode 100644
index a813ab1..0000000
--- a/ProjectCruiser/ProjectCruiser/Form1.Designer.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-namespace ProjectCruiser
-{
-    partial class Form1
-    {
-        /// <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()
-        {
-            SuspendLayout();
-            // 
-            // Form1
-            // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(800, 450);
-            Name = "Form1";
-            Text = "Form1";
-            ResumeLayout(false);
-        }
-
-        #endregion
-    }
-}
diff --git a/ProjectCruiser/ProjectCruiser/Form1.cs b/ProjectCruiser/ProjectCruiser/Form1.cs
deleted file mode 100644
index 99d4497..0000000
--- a/ProjectCruiser/ProjectCruiser/Form1.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace ProjectCruiser
-{
-    public partial class Form1 : Form
-    {
-        public Form1()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/ProjectCruiser/ProjectCruiser/FormCruiser.Designer.cs b/ProjectCruiser/ProjectCruiser/FormCruiser.Designer.cs
new file mode 100644
index 0000000..ebe2aab
--- /dev/null
+++ b/ProjectCruiser/ProjectCruiser/FormCruiser.Designer.cs
@@ -0,0 +1,130 @@
+namespace ProjectCruiser
+{
+    partial class FormCruiser
+    {
+        /// <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()
+        {
+            pictureBoxCruiser = new PictureBox();
+            buttonCreate = new Button();
+            buttonDown = new Button();
+            buttonUp = new Button();
+            buttonRight = new Button();
+            buttonLeft = new Button();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxCruiser).BeginInit();
+            SuspendLayout();
+            // 
+            // pictureBoxCruiser
+            // 
+            pictureBoxCruiser.Dock = DockStyle.Fill;
+            pictureBoxCruiser.Location = new Point(0, 0);
+            pictureBoxCruiser.Name = "pictureBoxCruiser";
+            pictureBoxCruiser.Size = new Size(800, 450);
+            pictureBoxCruiser.TabIndex = 0;
+            pictureBoxCruiser.TabStop = false;
+            // 
+            // buttonCreate
+            // 
+            buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            buttonCreate.Location = new Point(12, 409);
+            buttonCreate.Name = "buttonCreate";
+            buttonCreate.Size = new Size(94, 29);
+            buttonCreate.TabIndex = 1;
+            buttonCreate.Text = "Создать";
+            buttonCreate.UseVisualStyleBackColor = true;
+            buttonCreate.Click += ButtonCreate_Click;
+            // 
+            // buttonDown
+            // 
+            buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonDown.BackgroundImage = Properties.Resources.arrowDown;
+            buttonDown.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonDown.Location = new Point(682, 392);
+            buttonDown.Name = "buttonDown";
+            buttonDown.Size = new Size(35, 35);
+            buttonDown.TabIndex = 2;
+            buttonDown.UseVisualStyleBackColor = true;
+            // 
+            // buttonUp
+            // 
+            buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonUp.BackgroundImage = Properties.Resources.arrowUp;
+            buttonUp.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonUp.Location = new Point(682, 351);
+            buttonUp.Name = "buttonUp";
+            buttonUp.Size = new Size(35, 35);
+            buttonUp.TabIndex = 3;
+            buttonUp.UseVisualStyleBackColor = true;
+            // 
+            // buttonRight
+            // 
+            buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonRight.BackgroundImage = Properties.Resources.arrowRight;
+            buttonRight.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonRight.Location = new Point(723, 392);
+            buttonRight.Name = "buttonRight";
+            buttonRight.Size = new Size(35, 35);
+            buttonRight.TabIndex = 4;
+            buttonRight.UseVisualStyleBackColor = true;
+            // 
+            // buttonLeft
+            // 
+            buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonLeft.BackgroundImage = Properties.Resources.arrowLeft;
+            buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonLeft.Location = new Point(641, 392);
+            buttonLeft.Name = "buttonLeft";
+            buttonLeft.Size = new Size(35, 35);
+            buttonLeft.TabIndex = 5;
+            buttonLeft.UseVisualStyleBackColor = true;
+            // 
+            // FormCruiser
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(800, 450);
+            Controls.Add(buttonLeft);
+            Controls.Add(buttonRight);
+            Controls.Add(buttonUp);
+            Controls.Add(buttonDown);
+            Controls.Add(buttonCreate);
+            Controls.Add(pictureBoxCruiser);
+            Name = "FormCruiser";
+            Text = "Крейсер";
+            ((System.ComponentModel.ISupportInitialize)pictureBoxCruiser).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private PictureBox pictureBoxCruiser;
+        private Button buttonCreate;
+        private Button buttonDown;
+        private Button buttonUp;
+        private Button buttonRight;
+        private Button buttonLeft;
+    }
+}
\ No newline at end of file
diff --git a/ProjectCruiser/ProjectCruiser/FormCruiser.cs b/ProjectCruiser/ProjectCruiser/FormCruiser.cs
new file mode 100644
index 0000000..9a2a972
--- /dev/null
+++ b/ProjectCruiser/ProjectCruiser/FormCruiser.cs
@@ -0,0 +1,34 @@
+namespace ProjectCruiser
+{
+    public partial class FormCruiser : Form
+    {
+
+        private DrawingCruiser? _drawingCruiser;
+        public FormCruiser()
+        {
+            InitializeComponent();
+        }
+
+        private void ButtonCreate_Click(object sender, EventArgs e)
+        {
+            Random random = new();
+            _drawingCruiser = new DrawingCruiser();
+            _drawingCruiser.Init(
+                random.Next(100, 300),
+                random.Next(1000, 3000),
+                Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+                Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+                Convert.ToBoolean(random.Next(0, 2)),
+                Convert.ToBoolean(random.Next(0, 2)),
+                Convert.ToBoolean(random.Next(0, 2)));
+
+            _drawingCruiser.SetPictireSize(pictureBoxCruiser.Width, pictureBoxCruiser.Height);
+            _drawingCruiser.SetPosition(random.Next(10, 100), random.Next(10, 100));
+
+            Bitmap bmp = new(pictureBoxCruiser.Width, pictureBoxCruiser.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _drawingCruiser.DrawTransport(gr);
+            pictureBoxCruiser.Image = bmp;
+        }
+    }
+}
diff --git a/ProjectCruiser/ProjectCruiser/Form1.resx b/ProjectCruiser/ProjectCruiser/FormCruiser.resx
similarity index 100%
rename from ProjectCruiser/ProjectCruiser/Form1.resx
rename to ProjectCruiser/ProjectCruiser/FormCruiser.resx
diff --git a/ProjectCruiser/ProjectCruiser/Program.cs b/ProjectCruiser/ProjectCruiser/Program.cs
index 2ddf3fc..4e00cd8 100644
--- a/ProjectCruiser/ProjectCruiser/Program.cs
+++ b/ProjectCruiser/ProjectCruiser/Program.cs
@@ -11,7 +11,7 @@ namespace ProjectCruiser
             // 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 FormCruiser());
         }
     }
 }
\ No newline at end of file
diff --git a/ProjectCruiser/ProjectCruiser/ProjectCruiser.csproj b/ProjectCruiser/ProjectCruiser/ProjectCruiser.csproj
index 663fdb8..af03d74 100644
--- a/ProjectCruiser/ProjectCruiser/ProjectCruiser.csproj
+++ b/ProjectCruiser/ProjectCruiser/ProjectCruiser.csproj
@@ -8,4 +8,19 @@
     <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>
+
 </Project>
\ No newline at end of file
diff --git a/ProjectCruiser/ProjectCruiser/Properties/Resources.Designer.cs b/ProjectCruiser/ProjectCruiser/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..724a88c
--- /dev/null
+++ b/ProjectCruiser/ProjectCruiser/Properties/Resources.Designer.cs
@@ -0,0 +1,103 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Этот код создан программой.
+//     Исполняемая версия:4.0.30319.42000
+//
+//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+//     повторной генерации кода.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace ProjectCruiser.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("ProjectCruiser.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));
+            }
+        }
+    }
+}
diff --git a/ProjectCruiser/ProjectCruiser/Properties/Resources.resx b/ProjectCruiser/ProjectCruiser/Properties/Resources.resx
new file mode 100644
index 0000000..b4f1385
--- /dev/null
+++ b/ProjectCruiser/ProjectCruiser/Properties/Resources.resx
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <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>
+  <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>
\ No newline at end of file
diff --git a/ProjectCruiser/ProjectCruiser/Properties/Resources/arrowDown.png b/ProjectCruiser/ProjectCruiser/Properties/Resources/arrowDown.png
new file mode 100644
index 0000000000000000000000000000000000000000..fec397238906a866961464f4b0936a9387b4f4ce
GIT binary patch
literal 6633
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

literal 0
HcmV?d00001

diff --git a/ProjectCruiser/ProjectCruiser/Properties/Resources/arrowLeft.png b/ProjectCruiser/ProjectCruiser/Properties/Resources/arrowLeft.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a1d82c90b19c3f28ce9aced70c026d38f1520cb
GIT binary patch
literal 5878
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
A6aWAK

literal 0
HcmV?d00001

diff --git a/ProjectCruiser/ProjectCruiser/Properties/Resources/arrowRight.png b/ProjectCruiser/ProjectCruiser/Properties/Resources/arrowRight.png
new file mode 100644
index 0000000000000000000000000000000000000000..eecf7b04f24e1c6ae9c2000b05bb6945407bcd10
GIT binary patch
literal 5832
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

literal 0
HcmV?d00001

diff --git a/ProjectCruiser/ProjectCruiser/Properties/Resources/arrowUp.png b/ProjectCruiser/ProjectCruiser/Properties/Resources/arrowUp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2a4a9310e52bb624e595d17778a04dfc91b5b4c
GIT binary patch
literal 5884
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
a=e{Cp95u@+-u>&(QR}|GdePlyLH`BQpE#KS

literal 0
HcmV?d00001

-- 
2.25.1


From 32dc88b8a9431635a07da847c03bc77d6d096bc8 Mon Sep 17 00:00:00 2001
From: Almaz <79022113685@mail.ru>
Date: Tue, 9 Apr 2024 10:09:18 +0400
Subject: [PATCH 2/6] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B0=20=E2=84=961?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectCruiser/DrawingCruiser.cs          | 83 ++++---------------
 .../ProjectCruiser/FormCruiser.Designer.cs    | 28 ++++---
 ProjectCruiser/ProjectCruiser/FormCruiser.cs  | 49 +++++++++--
 3 files changed, 74 insertions(+), 86 deletions(-)

diff --git a/ProjectCruiser/ProjectCruiser/DrawingCruiser.cs b/ProjectCruiser/ProjectCruiser/DrawingCruiser.cs
index 93473bd..a1fb426 100644
--- a/ProjectCruiser/ProjectCruiser/DrawingCruiser.cs
+++ b/ProjectCruiser/ProjectCruiser/DrawingCruiser.cs
@@ -78,7 +78,7 @@ public class DrawingCruiser
 
     public bool MoveTransport(DirectionType direction)
     {
-        if (EntityCruiser == null || _startPosX.HasValue || _startPosY.HasValue)
+        if (EntityCruiser == null || !_startPosX.HasValue || !_startPosY.HasValue)
         {
             return false;
         }
@@ -99,8 +99,16 @@ public class DrawingCruiser
                 }
                 return true;
             case DirectionType.Right:
+                if (_startPosX.Value - EntityCruiser.Step > 0)
+                {
+                    _startPosX += (int)EntityCruiser.Step;
+                }
                 return true;
             case DirectionType.Down:
+                if (_startPosY.Value - EntityCruiser.Step > 0)
+                {
+                    _startPosY += (int)EntityCruiser.Step;
+                }
                 return true;
             default:
                 return false;
@@ -109,7 +117,7 @@ public class DrawingCruiser
 
     public void DrawTransport(Graphics g)
     {
-        if (EntityCruiser == null || !_startPosX.HasValue || _startPosY.HasValue)
+        if (EntityCruiser == null || !_startPosX.HasValue || !_startPosY.HasValue)
         {
             return;
         }
@@ -118,41 +126,7 @@ public class DrawingCruiser
 
         Brush additionalBrush = new SolidBrush(EntityCruiser.AdditionalColor);
 
-        if (EntityCruiser.BodyKit)
-        {
-            g.DrawEllipse(pen, _startPosX.Value + 90, _startPosY.Value, 20, 20);
-            g.DrawEllipse(pen, _startPosX.Value + 90, _startPosY.Value + 40, 20, 20);
-            g.DrawRectangle(pen, _startPosX.Value + 90, _startPosY.Value + 10, 20, 40);
-            g.DrawRectangle(pen, _startPosX.Value + 90, _startPosY.Value, 15, 15);
-            g.DrawRectangle(pen, _startPosX.Value + 90, _startPosY.Value + 45, 15, 15);
-
-            g.FillEllipse(additionalBrush, _startPosX.Value + 90, _startPosY.Value, 20, 20);
-            g.FillEllipse(additionalBrush, _startPosX.Value + 90, _startPosY.Value + 40, 20, 20);
-            g.FillRectangle(additionalBrush, _startPosX.Value + 90, _startPosY.Value + 10, 20, 40);
-            g.FillRectangle(additionalBrush, _startPosX.Value + 90, _startPosY.Value + 1, 15, 15);
-            g.FillRectangle(additionalBrush, _startPosX.Value + 90, _startPosY.Value + 45, 15, 15);
-
-
-            g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value, 20, 20);
-            g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value + 40, 20, 20);
-            g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 10, 20, 40);
-            g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value, 14, 15);
-            g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value + 45, 14, 15);
-
-            g.FillEllipse(additionalBrush, _startPosX.Value, _startPosY.Value, 20, 20);
-            g.FillEllipse(additionalBrush, _startPosX.Value, _startPosY.Value + 40, 20, 20);
-            g.FillRectangle(additionalBrush, _startPosX.Value + 1, _startPosY.Value + 10, 25, 40);
-            g.FillRectangle(additionalBrush, _startPosX.Value + 5, _startPosY.Value + 1, 15, 15);
-            g.FillRectangle(additionalBrush, _startPosX.Value + 5, _startPosY.Value + 45, 15, 15);
-
-            g.DrawRectangle(pen, _startPosX.Value + 35, _startPosY.Value, 39, 15);
-            g.DrawRectangle(pen, _startPosX.Value + 35, _startPosY.Value + 45, 39, 15);
-
-            g.FillRectangle(additionalBrush, _startPosX.Value + 35, _startPosY.Value + 1, 40, 15);
-            g.FillRectangle(additionalBrush, _startPosX.Value + 35, _startPosY.Value + 45, 40, 15);
-
-        }
-
+        //Границы крейсера
         g.DrawEllipse(pen, _startPosX.Value + 10, _startPosY.Value + 5, 20, 20);
         g.DrawEllipse(pen, _startPosX.Value + 10, _startPosY.Value + 35, 20, 20);
         g.DrawEllipse(pen, _startPosX.Value + 80, _startPosY.Value + 5, 20, 20);
@@ -161,36 +135,14 @@ public class DrawingCruiser
         g.DrawRectangle(pen, _startPosX.Value + 90, _startPosY.Value + 15, 10, 30);
         g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 4, 70, 52);
 
-        // задние фары
-        Brush brRed = new SolidBrush(Color.Red);
-        g.FillEllipse(brRed, _startPosX.Value + 10, _startPosY.Value + 5, 20, 20);
-        g.FillEllipse(brRed, _startPosX.Value + 10, _startPosY.Value + 35, 20, 20);
-
-        //передние фары
-        Brush brYellow = new SolidBrush(Color.Yellow);
-        g.FillEllipse(brYellow, _startPosX.Value + 80, _startPosY.Value + 5, 20, 20);
-        g.FillEllipse(brYellow, _startPosX.Value + 80, _startPosY.Value + 35, 20, 20);
-
-        //кузов
+        //кузов крейсера
         Brush br = new SolidBrush(EntityCruiser.BodyColor);
         g.FillRectangle(br, _startPosX.Value + 10, _startPosY.Value + 15, 10, 30);
         g.FillRectangle(br, _startPosX.Value + 90, _startPosY.Value + 15, 10, 30);
         g.FillRectangle(br, _startPosX.Value + 20, _startPosY.Value + 5, 70, 50);
 
-        //стекла
-        Brush brBlue = new SolidBrush(Color.LightBlue);
-        g.FillRectangle(brBlue, _startPosX.Value + 70, _startPosY.Value + 10, 5, 40);
-        g.FillRectangle(brBlue, _startPosX.Value + 30, _startPosY.Value + 10, 5, 40);
-        g.FillRectangle(brBlue, _startPosX.Value + 35, _startPosY.Value + 8, 35, 2);
-        g.FillRectangle(brBlue, _startPosX.Value + 35, _startPosY.Value + 51, 35, 2);
-
-        //выделяем рамкой крышу
-        g.DrawRectangle(pen, _startPosX.Value + 35, _startPosY.Value + 10, 35, 40);
-        g.DrawRectangle(pen, _startPosX.Value + 75, _startPosY.Value + 15, 25, 30);
-        g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 15, 15, 30);
-
-        // спортивная линия
-        if (EntityCruiser.Armor)
+        // оружие крейсера
+        if (EntityCruiser.Weapon)
         {
             g.FillRectangle(additionalBrush, _startPosX.Value + 75, _startPosY.Value + 23, 25, 15);
             g.FillRectangle(additionalBrush, _startPosX.Value + 35, _startPosY.Value + 23, 35, 15);
@@ -198,12 +150,5 @@ public class DrawingCruiser
 
         }
 
-        // крыло
-        if (EntityCruiser.Weapon)
-        {
-            g.FillRectangle(additionalBrush, _startPosX.Value, _startPosY.Value + 5, 10, 50);
-            g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 5, 10, 50);
-        }
-
     }
 }
diff --git a/ProjectCruiser/ProjectCruiser/FormCruiser.Designer.cs b/ProjectCruiser/ProjectCruiser/FormCruiser.Designer.cs
index ebe2aab..69e341a 100644
--- a/ProjectCruiser/ProjectCruiser/FormCruiser.Designer.cs
+++ b/ProjectCruiser/ProjectCruiser/FormCruiser.Designer.cs
@@ -29,7 +29,7 @@
         private void InitializeComponent()
         {
             pictureBoxCruiser = new PictureBox();
-            buttonCreate = new Button();
+            buttonCreateCruiser = new Button();
             buttonDown = new Button();
             buttonUp = new Button();
             buttonRight = new Button();
@@ -46,16 +46,16 @@
             pictureBoxCruiser.TabIndex = 0;
             pictureBoxCruiser.TabStop = false;
             // 
-            // buttonCreate
+            // buttonCreateCruiser
             // 
-            buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreate.Location = new Point(12, 409);
-            buttonCreate.Name = "buttonCreate";
-            buttonCreate.Size = new Size(94, 29);
-            buttonCreate.TabIndex = 1;
-            buttonCreate.Text = "Создать";
-            buttonCreate.UseVisualStyleBackColor = true;
-            buttonCreate.Click += ButtonCreate_Click;
+            buttonCreateCruiser.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            buttonCreateCruiser.Location = new Point(12, 409);
+            buttonCreateCruiser.Name = "buttonCreateCruiser";
+            buttonCreateCruiser.Size = new Size(94, 29);
+            buttonCreateCruiser.TabIndex = 1;
+            buttonCreateCruiser.Text = "Создать";
+            buttonCreateCruiser.UseVisualStyleBackColor = true;
+            buttonCreateCruiser.Click += ButtonCreateCruiser_Click;
             // 
             // buttonDown
             // 
@@ -67,6 +67,7 @@
             buttonDown.Size = new Size(35, 35);
             buttonDown.TabIndex = 2;
             buttonDown.UseVisualStyleBackColor = true;
+            buttonDown.Click += ButtonMove_Click;
             // 
             // buttonUp
             // 
@@ -78,6 +79,7 @@
             buttonUp.Size = new Size(35, 35);
             buttonUp.TabIndex = 3;
             buttonUp.UseVisualStyleBackColor = true;
+            buttonUp.Click += ButtonMove_Click;
             // 
             // buttonRight
             // 
@@ -89,6 +91,7 @@
             buttonRight.Size = new Size(35, 35);
             buttonRight.TabIndex = 4;
             buttonRight.UseVisualStyleBackColor = true;
+            buttonRight.Click += ButtonMove_Click;
             // 
             // buttonLeft
             // 
@@ -100,6 +103,7 @@
             buttonLeft.Size = new Size(35, 35);
             buttonLeft.TabIndex = 5;
             buttonLeft.UseVisualStyleBackColor = true;
+            buttonLeft.Click += ButtonMove_Click;
             // 
             // FormCruiser
             // 
@@ -110,7 +114,7 @@
             Controls.Add(buttonRight);
             Controls.Add(buttonUp);
             Controls.Add(buttonDown);
-            Controls.Add(buttonCreate);
+            Controls.Add(buttonCreateCruiser);
             Controls.Add(pictureBoxCruiser);
             Name = "FormCruiser";
             Text = "Крейсер";
@@ -121,7 +125,7 @@
         #endregion
 
         private PictureBox pictureBoxCruiser;
-        private Button buttonCreate;
+        private Button buttonCreateCruiser;
         private Button buttonDown;
         private Button buttonUp;
         private Button buttonRight;
diff --git a/ProjectCruiser/ProjectCruiser/FormCruiser.cs b/ProjectCruiser/ProjectCruiser/FormCruiser.cs
index 9a2a972..b12c168 100644
--- a/ProjectCruiser/ProjectCruiser/FormCruiser.cs
+++ b/ProjectCruiser/ProjectCruiser/FormCruiser.cs
@@ -9,7 +9,20 @@
             InitializeComponent();
         }
 
-        private void ButtonCreate_Click(object sender, EventArgs e)
+        private void Draw()
+        {
+            if (_drawingCruiser == null)
+            {
+                return;
+            }
+
+            Bitmap bmp = new(pictureBoxCruiser.Width, pictureBoxCruiser.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _drawingCruiser.DrawTransport(gr);
+            pictureBoxCruiser.Image = bmp;
+        }
+
+        private void ButtonCreateCruiser_Click(object sender, EventArgs e)
         {
             Random random = new();
             _drawingCruiser = new DrawingCruiser();
@@ -25,10 +38,36 @@
             _drawingCruiser.SetPictireSize(pictureBoxCruiser.Width, pictureBoxCruiser.Height);
             _drawingCruiser.SetPosition(random.Next(10, 100), random.Next(10, 100));
 
-            Bitmap bmp = new(pictureBoxCruiser.Width, pictureBoxCruiser.Height);
-            Graphics gr = Graphics.FromImage(bmp);
-            _drawingCruiser.DrawTransport(gr);
-            pictureBoxCruiser.Image = bmp;
+            Draw();
+        }
+
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            if(_drawingCruiser == null)
+            {
+                return;
+            }
+
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            bool result = false;
+            switch(name) {
+                case "buttonUp":
+                    result = _drawingCruiser.MoveTransport(DirectionType.Up); 
+                    break;
+                case "buttonDown":
+                    result = _drawingCruiser.MoveTransport(DirectionType.Down);
+                    break;
+                case "buttonLeft":
+                    result = _drawingCruiser.MoveTransport(DirectionType.Left);
+                    break;
+                case "buttonRight":
+                    result = _drawingCruiser.MoveTransport(DirectionType.Right);
+                    break;
+            }
+
+            if (result) {
+                Draw();
+            }
         }
     }
 }
-- 
2.25.1


From 45691d205ff21731c496514d66b31bd6d1be3ffb Mon Sep 17 00:00:00 2001
From: Almaz <79022113685@mail.ru>
Date: Tue, 9 Apr 2024 11:53:13 +0400
Subject: [PATCH 3/6] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=80=D0=BE=D0=B4=D0=B8=D1=82=D0=B5=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=B9=20=D0=B8=20=D0=B2=D0=B2=D0=BE=D0=B4=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BD=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D0=BE=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{ => Drawings}/DirectionType.cs           | 10 +--
 .../DrawningCruiser.cs}                       | 83 ++++++++++---------
 .../Drawings/DrawningMilitaryCruiser.cs       | 68 +++++++++++++++
 .../ProjectCruiser/Entities/EntityCruiser.cs  | 46 ++++++++++
 .../EntityMilitaryCruiser.cs}                 | 30 ++-----
 .../ProjectCruiser/FormCruiser.Designer.cs    | 38 ++++++---
 ProjectCruiser/ProjectCruiser/FormCruiser.cs  | 53 +++++++++---
 7 files changed, 236 insertions(+), 92 deletions(-)
 rename ProjectCruiser/ProjectCruiser/{ => Drawings}/DirectionType.cs (85%)
 rename ProjectCruiser/ProjectCruiser/{DrawingCruiser.cs => Drawings/DrawningCruiser.cs} (58%)
 create mode 100644 ProjectCruiser/ProjectCruiser/Drawings/DrawningMilitaryCruiser.cs
 create mode 100644 ProjectCruiser/ProjectCruiser/Entities/EntityCruiser.cs
 rename ProjectCruiser/ProjectCruiser/{EntityCruiser.cs => Entities/EntityMilitaryCruiser.cs} (66%)

diff --git a/ProjectCruiser/ProjectCruiser/DirectionType.cs b/ProjectCruiser/ProjectCruiser/Drawings/DirectionType.cs
similarity index 85%
rename from ProjectCruiser/ProjectCruiser/DirectionType.cs
rename to ProjectCruiser/ProjectCruiser/Drawings/DirectionType.cs
index 4cdd1e9..3ea0799 100644
--- a/ProjectCruiser/ProjectCruiser/DirectionType.cs
+++ b/ProjectCruiser/ProjectCruiser/Drawings/DirectionType.cs
@@ -4,17 +4,17 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ProjectCruiser;
+namespace ProjectCruiser.Drawings;
 
 /// <summary>
 /// Направление перемещения
 /// </summary>
-    public enum DirectionType
-    {
+public enum DirectionType
+{
     /// <summary>
     /// Вверх
     /// </summary>
-    Up = 1, 
+    Up = 1,
     /// <summary>
     /// Вниз
     /// </summary>
@@ -27,5 +27,5 @@ namespace ProjectCruiser;
     /// Вправо
     /// </summary>
     Right = 4
-    }
+}
 
diff --git a/ProjectCruiser/ProjectCruiser/DrawingCruiser.cs b/ProjectCruiser/ProjectCruiser/Drawings/DrawningCruiser.cs
similarity index 58%
rename from ProjectCruiser/ProjectCruiser/DrawingCruiser.cs
rename to ProjectCruiser/ProjectCruiser/Drawings/DrawningCruiser.cs
index a1fb426..b953713 100644
--- a/ProjectCruiser/ProjectCruiser/DrawingCruiser.cs
+++ b/ProjectCruiser/ProjectCruiser/Drawings/DrawningCruiser.cs
@@ -3,15 +3,16 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using ProjectCruiser.Entities;
 
-namespace ProjectCruiser;
+namespace ProjectCruiser.Drawings;
 
-public class DrawingCruiser
+public class DrawningCruiser
 {
     /// <summary>
     /// Класс-сущность
     /// </summary>
-    public EntityCruiser? EntityCruiser { get; private set; }
+    public EntityCruiser? EntityCruiser { get; protected set; }
     /// <summary>
     /// Ширина окна
     /// </summary>
@@ -23,41 +24,53 @@ public class DrawingCruiser
     /// <summary>
     /// Левая координата прорисовки крейсера
     /// </summary>
-    private int? _startPosX;
+    protected int? _startPosX;
     /// <summary>
     /// Верхняя координата прорисовки крейсера
     /// </summary>
-    private int? _startPosY;
+    protected int? _startPosY;
 
     /// <summary>
     /// Ширина прорисовки крейсера
     /// </summary>
-    private readonly int _drawningCruiserWidth = 110;
+    private readonly int _drawningCruiserWidth = 90;
     /// <summary>
     /// Высота прорисовки крейсера
     /// </summary>
-    private readonly int _drawingCruiserHeight = 60;
+    private readonly int _drawingCruiserHeight = 50;
 
     /// <summary>
-    /// Инициализация полей объекта класса крейсера 
+    /// Пустой конструктор
     /// </summary>
-    /// <param name="speed">Скорость</param>
-    /// <param name="weigth">Вес крейсера</param>
-    /// <param name="bodyColor">Скорость</param>
-    /// <param name="additionalColor">Дополнительный цвет</param>
-    /// <param name="bodyKit">Признак наличия обвеса</param>
-    /// <param name="armor">Признак наличия брони</param>
-    /// <param name="weapon">Признак наличия оружия</param>
-    public void Init(int speed, double weigth, Color bodyColor, Color additionalColor, bool bodyKit, bool armor, bool weapon)
-    {
-        EntityCruiser = new EntityCruiser();
-        EntityCruiser.Init(speed, weigth, bodyColor, additionalColor, bodyKit, armor, weapon);
+    private DrawningCruiser() {
         _pictureWidth = null;
         _pictureHeight = null;
         _startPosX = null;
         _startPosY = null;
     }
 
+    /// <summary>
+    /// Констуктор 
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weigth">Вес крейсера</param>
+    /// <param name="bodyColor">Скорость</param>
+    public DrawningCruiser(int speed, double weigth, Color bodyColor): this()
+    {
+        EntityCruiser = new EntityCruiser(speed, weigth, bodyColor);
+    }
+
+    /// <summary>
+    /// Констуктор для наследников
+    /// </summary>
+    /// <param name="drawningCruiserWidth">Ширина прорисовки крейсера</param>
+    /// <param name="drawingCruiserHeight">Высота прорисовки крейсера</param>
+    protected DrawningCruiser(int drawningCruiserWidth, int drawingCruiserHeight) : this()
+    {
+        _drawningCruiserWidth = drawningCruiserWidth;
+        _drawingCruiserHeight = drawingCruiserHeight;
+    }
+
     public bool SetPictireSize(int width, int height)
     {
         _pictureWidth = width;
@@ -115,7 +128,7 @@ public class DrawingCruiser
         }
     }
 
-    public void DrawTransport(Graphics g)
+    public virtual void DrawTransport(Graphics g)
     {
         if (EntityCruiser == null || !_startPosX.HasValue || !_startPosY.HasValue)
         {
@@ -124,31 +137,21 @@ public class DrawingCruiser
 
         Pen pen = new(Color.Black);
 
-        Brush additionalBrush = new SolidBrush(EntityCruiser.AdditionalColor);
 
         //Границы крейсера
-        g.DrawEllipse(pen, _startPosX.Value + 10, _startPosY.Value + 5, 20, 20);
-        g.DrawEllipse(pen, _startPosX.Value + 10, _startPosY.Value + 35, 20, 20);
-        g.DrawEllipse(pen, _startPosX.Value + 80, _startPosY.Value + 5, 20, 20);
-        g.DrawEllipse(pen, _startPosX.Value + 80, _startPosY.Value + 35, 20, 20);
-        g.DrawRectangle(pen, _startPosX.Value + 9, _startPosY.Value + 15, 10, 30);
-        g.DrawRectangle(pen, _startPosX.Value + 90, _startPosY.Value + 15, 10, 30);
-        g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 4, 70, 52);
+        g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value, 20, 20);
+        g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value + 30, 20, 20);
+        g.DrawEllipse(pen, _startPosX.Value + 70, _startPosY.Value, 20, 20);
+        g.DrawEllipse(pen, _startPosX.Value + 70, _startPosY.Value + 30, 20, 20);
+        g.DrawRectangle(pen, _startPosX.Value + 1, _startPosY.Value + 10, 10, 30);
+        g.DrawRectangle(pen, _startPosX.Value + 80, _startPosY.Value + 10, 10, 30);
+        g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 1, 70, 52);
 
         //кузов крейсера
         Brush br = new SolidBrush(EntityCruiser.BodyColor);
-        g.FillRectangle(br, _startPosX.Value + 10, _startPosY.Value + 15, 10, 30);
-        g.FillRectangle(br, _startPosX.Value + 90, _startPosY.Value + 15, 10, 30);
-        g.FillRectangle(br, _startPosX.Value + 20, _startPosY.Value + 5, 70, 50);
-
-        // оружие крейсера
-        if (EntityCruiser.Weapon)
-        {
-            g.FillRectangle(additionalBrush, _startPosX.Value + 75, _startPosY.Value + 23, 25, 15);
-            g.FillRectangle(additionalBrush, _startPosX.Value + 35, _startPosY.Value + 23, 35, 15);
-            g.FillRectangle(additionalBrush, _startPosX.Value + 10, _startPosY.Value + 23, 20, 15);
-
-        }
+        g.FillRectangle(br, _startPosX.Value, _startPosY.Value + 10, 10, 30);
+        g.FillRectangle(br, _startPosX.Value + 80, _startPosY.Value + 10, 10, 30);
+        g.FillRectangle(br, _startPosX.Value + 10, _startPosY.Value, 70, 50);
 
     }
 }
diff --git a/ProjectCruiser/ProjectCruiser/Drawings/DrawningMilitaryCruiser.cs b/ProjectCruiser/ProjectCruiser/Drawings/DrawningMilitaryCruiser.cs
new file mode 100644
index 0000000..b86968c
--- /dev/null
+++ b/ProjectCruiser/ProjectCruiser/Drawings/DrawningMilitaryCruiser.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ProjectCruiser.Entities;
+
+namespace ProjectCruiser.Drawings;
+
+public class DrawningMilitaryCruiser: DrawningCruiser
+{
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weigth">Вес крейсера</param>
+    /// <param name="bodyColor">Скорость</param>
+    /// <param name="additionalColor">Дополнительный цвет</param>
+    /// <param name="bodyKit">Признак наличия обвеса</param>
+    /// <param name="armor">Признак наличия брони</param>
+    /// <param name="weapon">Признак наличия оружия</param>
+    public DrawningMilitaryCruiser(int speed, double weigth, Color bodyColor, Color additionalColor, bool bodyKit, bool armor, bool weapon): base(110, 60)
+    {
+        EntityCruiser = new EntityMilitaryCruiser(speed, weigth, bodyColor, additionalColor, bodyKit, armor, weapon);
+    }
+
+    public override void DrawTransport(Graphics g)
+    {
+
+        if (EntityCruiser == null || EntityCruiser is not EntityMilitaryCruiser militaryCruiser || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return;
+        }
+
+        Pen pen = new(Color.Black);
+        Brush additionalBrush = new SolidBrush(militaryCruiser.AdditionalColor);
+
+        //Границы крейсера
+        g.DrawEllipse(pen, _startPosX.Value + 10, _startPosY.Value + 5, 20, 20);
+        g.DrawEllipse(pen, _startPosX.Value + 10, _startPosY.Value + 35, 20, 20);
+        g.DrawEllipse(pen, _startPosX.Value + 80, _startPosY.Value + 5, 20, 20);
+        g.DrawEllipse(pen, _startPosX.Value + 80, _startPosY.Value + 35, 20, 20);
+        g.DrawRectangle(pen, _startPosX.Value + 9, _startPosY.Value + 15, 10, 30);
+        g.DrawRectangle(pen, _startPosX.Value + 90, _startPosY.Value + 15, 10, 30);
+        g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 4, 70, 52);
+
+        //кузов крейсера
+        Brush br = new SolidBrush(militaryCruiser.BodyColor);
+        g.FillRectangle(br, _startPosX.Value + 10, _startPosY.Value + 15, 10, 30);
+        g.FillRectangle(br, _startPosX.Value + 90, _startPosY.Value + 15, 10, 30);
+        g.FillRectangle(br, _startPosX.Value + 20, _startPosY.Value + 5, 70, 50);
+
+        _startPosX += 10;
+        _startPosY += 5;
+        base.DrawTransport(g);
+        _startPosX -= 10;
+        _startPosY -= 5;
+
+        // оружие крейсера
+        if (militaryCruiser.Weapon)
+        {
+            g.FillRectangle(additionalBrush, _startPosX.Value + 75, _startPosY.Value + 23, 25, 15);
+            g.FillRectangle(additionalBrush, _startPosX.Value + 35, _startPosY.Value + 23, 35, 15);
+            g.FillRectangle(additionalBrush, _startPosX.Value + 10, _startPosY.Value + 23, 20, 15);
+
+        }
+    }
+}
diff --git a/ProjectCruiser/ProjectCruiser/Entities/EntityCruiser.cs b/ProjectCruiser/ProjectCruiser/Entities/EntityCruiser.cs
new file mode 100644
index 0000000..0f9bcb5
--- /dev/null
+++ b/ProjectCruiser/ProjectCruiser/Entities/EntityCruiser.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectCruiser.Entities;
+
+/// <summary>
+/// Класс-сущность "Крейсер" Вариант 18
+/// </summary>
+public class EntityCruiser
+{
+    /// <summary>
+    /// Скорость
+    /// </summary>
+    public int Speed { get; protected set; }
+
+    /// <summary>
+    /// Вес
+    /// </summary>
+    public double Weigth { get; protected set; }
+
+    /// <summary>
+    /// Основной цвет
+    /// </summary>
+    public Color BodyColor { get; protected set; }
+
+    /// <summary>
+    /// Шаг перемещения крейсера
+    /// </summary>
+    public double Step => Speed * 100 / Weigth;
+
+    /// <summary>
+    /// Конструктор сущности 
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weigth">Вес крейсера</param>
+    /// <param name="bodyColor">Скорость</param>
+    public EntityCruiser(int speed, double weigth, Color bodyColor)
+    {
+        Speed = speed;
+        Weigth = weigth;
+        BodyColor = bodyColor;
+    }
+}
diff --git a/ProjectCruiser/ProjectCruiser/EntityCruiser.cs b/ProjectCruiser/ProjectCruiser/Entities/EntityMilitaryCruiser.cs
similarity index 66%
rename from ProjectCruiser/ProjectCruiser/EntityCruiser.cs
rename to ProjectCruiser/ProjectCruiser/Entities/EntityMilitaryCruiser.cs
index 8fdcd5d..eb780c0 100644
--- a/ProjectCruiser/ProjectCruiser/EntityCruiser.cs
+++ b/ProjectCruiser/ProjectCruiser/Entities/EntityMilitaryCruiser.cs
@@ -1,25 +1,10 @@
-namespace ProjectCruiser
+namespace ProjectCruiser.Entities
 {
     /// <summary>
-    /// Класс-сущность "Крейсер" Вариант 18
+    /// Класс-сущность "Военный Крейсер" Вариант 18
     /// </summary>
-    public class EntityCruiser
-    {   
-        /// <summary>
-        /// Скорость
-        /// </summary>
-        public int Speed { get; private set; }
-
-        /// <summary>
-        /// Вес
-        /// </summary>
-        public double Weigth { get; private set; }
-
-        /// <summary>
-        /// Основной цвет
-        /// </summary>
-        public Color BodyColor { get; private set; }
-
+    public class EntityMilitaryCruiser: EntityCruiser
+    {
         /// <summary>
         /// Дополнительный цвет (для опциональных элементов)
         /// </summary>
@@ -40,11 +25,6 @@
         /// </summary>
         public bool Weapon { get; private set; }
 
-        /// <summary>
-        /// Шаг перемещения крейсера
-        /// </summary>
-        public double Step => Speed * 100 / Weigth;
-
         /// <summary>
         /// Инициализация полей объекта класса крейсера 
         /// </summary>
@@ -55,7 +35,7 @@
         /// <param name="bodyKit">Признак наличия обвеса</param>
         /// <param name="armor">Признак наличия брони</param>
         /// <param name="weapon">Признак наличия оружия</param>
-        public void Init(int speed, double weigth, Color bodyColor, Color additionalColor, bool bodyKit, bool armor, bool weapon)
+        public EntityMilitaryCruiser(int speed, double weigth, Color bodyColor, Color additionalColor, bool bodyKit, bool armor, bool weapon): base(speed, weigth, bodyColor)
         {
             Speed = speed;
             Weigth = weigth;
diff --git a/ProjectCruiser/ProjectCruiser/FormCruiser.Designer.cs b/ProjectCruiser/ProjectCruiser/FormCruiser.Designer.cs
index 69e341a..ec630ad 100644
--- a/ProjectCruiser/ProjectCruiser/FormCruiser.Designer.cs
+++ b/ProjectCruiser/ProjectCruiser/FormCruiser.Designer.cs
@@ -29,11 +29,12 @@
         private void InitializeComponent()
         {
             pictureBoxCruiser = new PictureBox();
-            buttonCreateCruiser = new Button();
+            buttonCreateMilitaryCruiser = new Button();
             buttonDown = new Button();
             buttonUp = new Button();
             buttonRight = new Button();
             buttonLeft = new Button();
+            buttonCreateCruiser = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxCruiser).BeginInit();
             SuspendLayout();
             // 
@@ -46,16 +47,16 @@
             pictureBoxCruiser.TabIndex = 0;
             pictureBoxCruiser.TabStop = false;
             // 
-            // buttonCreateCruiser
+            // buttonCreateMilitaryCruiser
             // 
-            buttonCreateCruiser.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateCruiser.Location = new Point(12, 409);
-            buttonCreateCruiser.Name = "buttonCreateCruiser";
-            buttonCreateCruiser.Size = new Size(94, 29);
-            buttonCreateCruiser.TabIndex = 1;
-            buttonCreateCruiser.Text = "Создать";
-            buttonCreateCruiser.UseVisualStyleBackColor = true;
-            buttonCreateCruiser.Click += ButtonCreateCruiser_Click;
+            buttonCreateMilitaryCruiser.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            buttonCreateMilitaryCruiser.Location = new Point(12, 409);
+            buttonCreateMilitaryCruiser.Name = "buttonCreateMilitaryCruiser";
+            buttonCreateMilitaryCruiser.Size = new Size(216, 29);
+            buttonCreateMilitaryCruiser.TabIndex = 1;
+            buttonCreateMilitaryCruiser.Text = "Создать военный крейсер";
+            buttonCreateMilitaryCruiser.UseVisualStyleBackColor = true;
+            buttonCreateMilitaryCruiser.Click += ButtonCreateMilitaryCruiser_Click;
             // 
             // buttonDown
             // 
@@ -105,16 +106,28 @@
             buttonLeft.UseVisualStyleBackColor = true;
             buttonLeft.Click += ButtonMove_Click;
             // 
+            // buttonCreateCruiser
+            // 
+            buttonCreateCruiser.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            buttonCreateCruiser.Location = new Point(234, 409);
+            buttonCreateCruiser.Name = "buttonCreateCruiser";
+            buttonCreateCruiser.Size = new Size(179, 29);
+            buttonCreateCruiser.TabIndex = 6;
+            buttonCreateCruiser.Text = "Создать крейсер";
+            buttonCreateCruiser.UseVisualStyleBackColor = true;
+            buttonCreateCruiser.Click += buttonCreateCruiser_Click;
+            // 
             // FormCruiser
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(800, 450);
+            Controls.Add(buttonCreateCruiser);
             Controls.Add(buttonLeft);
             Controls.Add(buttonRight);
             Controls.Add(buttonUp);
             Controls.Add(buttonDown);
-            Controls.Add(buttonCreateCruiser);
+            Controls.Add(buttonCreateMilitaryCruiser);
             Controls.Add(pictureBoxCruiser);
             Name = "FormCruiser";
             Text = "Крейсер";
@@ -125,10 +138,11 @@
         #endregion
 
         private PictureBox pictureBoxCruiser;
-        private Button buttonCreateCruiser;
+        private Button buttonCreateMilitaryCruiser;
         private Button buttonDown;
         private Button buttonUp;
         private Button buttonRight;
         private Button buttonLeft;
+        private Button buttonCreateCruiser;
     }
 }
\ No newline at end of file
diff --git a/ProjectCruiser/ProjectCruiser/FormCruiser.cs b/ProjectCruiser/ProjectCruiser/FormCruiser.cs
index b12c168..af4d3d6 100644
--- a/ProjectCruiser/ProjectCruiser/FormCruiser.cs
+++ b/ProjectCruiser/ProjectCruiser/FormCruiser.cs
@@ -1,9 +1,11 @@
-namespace ProjectCruiser
+using ProjectCruiser.Drawings;
+
+namespace ProjectCruiser
 {
     public partial class FormCruiser : Form
     {
 
-        private DrawingCruiser? _drawingCruiser;
+        private DrawningCruiser? _drawingCruiser;
         public FormCruiser()
         {
             InitializeComponent();
@@ -22,12 +24,20 @@
             pictureBoxCruiser.Image = bmp;
         }
 
-        private void ButtonCreateCruiser_Click(object sender, EventArgs e)
+        private void CreateObject(string type)
         {
             Random random = new();
-            _drawingCruiser = new DrawingCruiser();
-            _drawingCruiser.Init(
-                random.Next(100, 300),
+            switch (type)
+            {
+                case nameof(DrawningCruiser):
+
+                    _drawingCruiser = new DrawningCruiser(random.Next(100, 300), random.Next(1000, 3000),
+                        Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)));
+                    break;
+
+                case nameof(DrawningMilitaryCruiser):
+
+                _drawingCruiser = new DrawningMilitaryCruiser(random.Next(100, 300),
                 random.Next(1000, 3000),
                 Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
                 Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
@@ -35,24 +45,45 @@
                 Convert.ToBoolean(random.Next(0, 2)),
                 Convert.ToBoolean(random.Next(0, 2)));
 
+                    break;
+
+                default:
+                    return;
+            }
+
             _drawingCruiser.SetPictireSize(pictureBoxCruiser.Width, pictureBoxCruiser.Height);
             _drawingCruiser.SetPosition(random.Next(10, 100), random.Next(10, 100));
 
             Draw();
         }
 
+        /// <summary>
+        /// Обработка нажатия кнопки "Создать военный крейсер"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreateMilitaryCruiser_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningMilitaryCruiser));
+
+        /// <summary>
+        /// Обработка нажатия кнопки "Создать крейсер"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonCreateCruiser_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningCruiser));
+
         private void ButtonMove_Click(object sender, EventArgs e)
         {
-            if(_drawingCruiser == null)
+            if (_drawingCruiser == null)
             {
                 return;
             }
 
             string name = ((Button)sender)?.Name ?? string.Empty;
             bool result = false;
-            switch(name) {
+            switch (name)
+            {
                 case "buttonUp":
-                    result = _drawingCruiser.MoveTransport(DirectionType.Up); 
+                    result = _drawingCruiser.MoveTransport(DirectionType.Up);
                     break;
                 case "buttonDown":
                     result = _drawingCruiser.MoveTransport(DirectionType.Down);
@@ -65,9 +96,11 @@
                     break;
             }
 
-            if (result) {
+            if (result)
+            {
                 Draw();
             }
         }
+
     }
 }
-- 
2.25.1


From 1bde4734fcd08a7bc4a2a2846d70b6226c9a182b Mon Sep 17 00:00:00 2001
From: Almaz <79022113685@mail.ru>
Date: Tue, 9 Apr 2024 15:02:30 +0400
Subject: [PATCH 4/6] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D1=80=D0=B0=D1=82=D0=B5=D0=B3?=
 =?UTF-8?q?=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectCruiser/Drawings/DirectionType.cs  |   8 +
 .../Drawings/DrawningCruiser.cs               |  21 +++
 .../ProjectCruiser/FormCruiser.Designer.cs    |  28 ++++
 ProjectCruiser/ProjectCruiser/FormCruiser.cs  |  60 +++++++-
 .../MovementStrategy/AbstactStrategy.cs       | 138 ++++++++++++++++++
 .../MovementStrategy/IMoveableObject.cs       |  30 ++++
 .../MovementStrategy/MoveToBorder.cs          |  50 +++++++
 .../MovementStrategy/MoveToCenter.cs          |  54 +++++++
 .../MovementStrategy/MoveableCruiser.cs       |  68 +++++++++
 .../MovementStrategy/MovementDirection.cs     |  24 +++
 .../MovementStrategy/ObjectParameters.cs      |  77 ++++++++++
 .../MovementStrategy/StrategyStatus.cs        |  26 ++++
 12 files changed, 576 insertions(+), 8 deletions(-)
 create mode 100644 ProjectCruiser/ProjectCruiser/MovementStrategy/AbstactStrategy.cs
 create mode 100644 ProjectCruiser/ProjectCruiser/MovementStrategy/IMoveableObject.cs
 create mode 100644 ProjectCruiser/ProjectCruiser/MovementStrategy/MoveToBorder.cs
 create mode 100644 ProjectCruiser/ProjectCruiser/MovementStrategy/MoveToCenter.cs
 create mode 100644 ProjectCruiser/ProjectCruiser/MovementStrategy/MoveableCruiser.cs
 create mode 100644 ProjectCruiser/ProjectCruiser/MovementStrategy/MovementDirection.cs
 create mode 100644 ProjectCruiser/ProjectCruiser/MovementStrategy/ObjectParameters.cs
 create mode 100644 ProjectCruiser/ProjectCruiser/MovementStrategy/StrategyStatus.cs

diff --git a/ProjectCruiser/ProjectCruiser/Drawings/DirectionType.cs b/ProjectCruiser/ProjectCruiser/Drawings/DirectionType.cs
index 3ea0799..4f4876b 100644
--- a/ProjectCruiser/ProjectCruiser/Drawings/DirectionType.cs
+++ b/ProjectCruiser/ProjectCruiser/Drawings/DirectionType.cs
@@ -11,18 +11,26 @@ namespace ProjectCruiser.Drawings;
 /// </summary>
 public enum DirectionType
 {
+    /// <summary>
+    /// Неизвестное направление
+    /// </summary>
+    Unknow = -1,
+
     /// <summary>
     /// Вверх
     /// </summary>
     Up = 1,
+
     /// <summary>
     /// Вниз
     /// </summary>
     Down = 2,
+
     /// <summary>
     /// Влева
     /// </summary>
     Left = 3,
+
     /// <summary>
     /// Вправо
     /// </summary>
diff --git a/ProjectCruiser/ProjectCruiser/Drawings/DrawningCruiser.cs b/ProjectCruiser/ProjectCruiser/Drawings/DrawningCruiser.cs
index b953713..ea8c06f 100644
--- a/ProjectCruiser/ProjectCruiser/Drawings/DrawningCruiser.cs
+++ b/ProjectCruiser/ProjectCruiser/Drawings/DrawningCruiser.cs
@@ -24,6 +24,7 @@ public class DrawningCruiser
     /// <summary>
     /// Левая координата прорисовки крейсера
     /// </summary>
+    
     protected int? _startPosX;
     /// <summary>
     /// Верхняя координата прорисовки крейсера
@@ -39,6 +40,26 @@ public class DrawningCruiser
     /// </summary>
     private readonly int _drawingCruiserHeight = 50;
 
+    /// <summary>
+    /// Координата X объекта
+    /// </summary>
+    public int? GetPosX => _startPosX;
+
+    /// <summary>
+    /// Координата Y объекта
+    /// </summary>
+    public int? GetPosY => _startPosY;
+
+    /// <summary>
+    /// Ширина объекта
+    /// </summary>
+    public int GetWidth => _drawningCruiserWidth;
+
+    /// <summary>
+    /// Высота объекта
+    /// </summary>
+    public int GetHeight => _drawingCruiserHeight;
+
     /// <summary>
     /// Пустой конструктор
     /// </summary>
diff --git a/ProjectCruiser/ProjectCruiser/FormCruiser.Designer.cs b/ProjectCruiser/ProjectCruiser/FormCruiser.Designer.cs
index ec630ad..9b8c644 100644
--- a/ProjectCruiser/ProjectCruiser/FormCruiser.Designer.cs
+++ b/ProjectCruiser/ProjectCruiser/FormCruiser.Designer.cs
@@ -35,6 +35,8 @@
             buttonRight = new Button();
             buttonLeft = new Button();
             buttonCreateCruiser = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxCruiser).BeginInit();
             SuspendLayout();
             // 
@@ -117,11 +119,35 @@
             buttonCreateCruiser.UseVisualStyleBackColor = true;
             buttonCreateCruiser.Click += buttonCreateCruiser_Click;
             // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled = true;
+            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+            comboBoxStrategy.Location = new Point(637, 12);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(151, 28);
+            comboBoxStrategy.TabIndex = 7;
+            // 
+            // buttonStrategyStep
+            // 
+            buttonStrategyStep.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            buttonStrategyStep.Location = new Point(694, 46);
+            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStrategyStep.Size = new Size(94, 29);
+            buttonStrategyStep.TabIndex = 8;
+            buttonStrategyStep.Text = "Шаг";
+            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStrategyStep.Click += ButtonStrategyStep_Click;
+            // 
             // FormCruiser
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(800, 450);
+            Controls.Add(buttonStrategyStep);
+            Controls.Add(comboBoxStrategy);
             Controls.Add(buttonCreateCruiser);
             Controls.Add(buttonLeft);
             Controls.Add(buttonRight);
@@ -144,5 +170,7 @@
         private Button buttonRight;
         private Button buttonLeft;
         private Button buttonCreateCruiser;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStrategyStep;
     }
 }
\ No newline at end of file
diff --git a/ProjectCruiser/ProjectCruiser/FormCruiser.cs b/ProjectCruiser/ProjectCruiser/FormCruiser.cs
index af4d3d6..1cce72e 100644
--- a/ProjectCruiser/ProjectCruiser/FormCruiser.cs
+++ b/ProjectCruiser/ProjectCruiser/FormCruiser.cs
@@ -1,4 +1,5 @@
 using ProjectCruiser.Drawings;
+using ProjectCruiser.MovementStrategy;
 
 namespace ProjectCruiser
 {
@@ -6,9 +7,12 @@ namespace ProjectCruiser
     {
 
         private DrawningCruiser? _drawingCruiser;
+
+        private AbstactStrategy? _strategy;
         public FormCruiser()
         {
             InitializeComponent();
+            _strategy = null;
         }
 
         private void Draw()
@@ -37,13 +41,13 @@ namespace ProjectCruiser
 
                 case nameof(DrawningMilitaryCruiser):
 
-                _drawingCruiser = new DrawningMilitaryCruiser(random.Next(100, 300),
-                random.Next(1000, 3000),
-                Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-                Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-                Convert.ToBoolean(random.Next(0, 2)),
-                Convert.ToBoolean(random.Next(0, 2)),
-                Convert.ToBoolean(random.Next(0, 2)));
+                    _drawingCruiser = new DrawningMilitaryCruiser(random.Next(100, 300),
+                    random.Next(1000, 3000),
+                    Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+                    Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+                    Convert.ToBoolean(random.Next(0, 2)),
+                    Convert.ToBoolean(random.Next(0, 2)),
+                    Convert.ToBoolean(random.Next(0, 2)));
 
                     break;
 
@@ -53,7 +57,8 @@ namespace ProjectCruiser
 
             _drawingCruiser.SetPictireSize(pictureBoxCruiser.Width, pictureBoxCruiser.Height);
             _drawingCruiser.SetPosition(random.Next(10, 100), random.Next(10, 100));
-
+            _strategy = null;
+            comboBoxStrategy.Enabled = true;
             Draw();
         }
 
@@ -102,5 +107,44 @@ namespace ProjectCruiser
             }
         }
 
+        /// <summary>
+        /// Обработка нажатия кнопки "Шаг"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonStrategyStep_Click(object sender, EventArgs e)
+        {
+            if (_drawingCruiser == null) { return; }
+
+            if (comboBoxStrategy.Enabled)
+            {
+                _strategy = comboBoxStrategy.SelectedIndex switch
+                {
+                    0 => new MoveToCenter(),
+                    1 => new MoveToBorder(),
+                    _ => null,
+                };
+                if (_strategy == null)
+                {
+                    return ;
+                }
+                _strategy.SetData(new MoveableCruiser(_drawingCruiser), pictureBoxCruiser.Width, pictureBoxCruiser.Height);
+            }
+
+            if (_strategy == null)
+            {
+                return;
+            }
+
+            comboBoxStrategy.Enabled = false;
+            _strategy.MakeStep();
+            Draw();
+
+            if (_strategy.GetStatus() == StrategyStatus.Finish) 
+            {
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+            }
+        }
     }
 }
diff --git a/ProjectCruiser/ProjectCruiser/MovementStrategy/AbstactStrategy.cs b/ProjectCruiser/ProjectCruiser/MovementStrategy/AbstactStrategy.cs
new file mode 100644
index 0000000..b38a124
--- /dev/null
+++ b/ProjectCruiser/ProjectCruiser/MovementStrategy/AbstactStrategy.cs
@@ -0,0 +1,138 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectCruiser.MovementStrategy;
+
+/// <summary>
+/// Класс-стратегия перемещения объекта
+/// </summary>
+public abstract class AbstactStrategy
+{
+    /// <summary>
+    /// Перемещаемы объект
+    /// </summary>
+    private IMoveableObject? _moveableObject;
+
+    /// <summary>
+    /// Статус перемещения
+    /// </summary>
+    private StrategyStatus _state = StrategyStatus.NotInit;
+
+    /// <summary>
+    /// Ширина перемещения
+    /// </summary>
+    protected int FieldWidth {  get; private set; }
+
+    /// <summary>
+    /// Высота перемещения
+    /// </summary>
+    protected int FieldHeight { get; private set; }
+    
+    /// <summary>
+    /// Статус перемещения
+    /// </summary>
+    public StrategyStatus GetStatus() {  return _state; }
+
+    /// <summary>
+    /// Установка данных
+    /// </summary>
+    /// <param name="moveableObject">Перемещаемы объект</param>
+    /// <param name="width">Ширина поля</param>
+    /// <param name="height">Высота поля</param>
+    public void SetData(IMoveableObject moveableObject, int width, int height)
+    {
+        if (moveableObject == null)
+        {
+            _state = StrategyStatus.NotInit;
+            return;
+        }
+
+        _state = StrategyStatus.InProgress;
+        _moveableObject = moveableObject;
+        FieldWidth = width;
+        FieldHeight = height;
+    }
+
+    /// <summary>
+    /// Шаг перемещения
+    /// </summary>
+    public void MakeStep()
+    {
+        if (_state != StrategyStatus.InProgress)
+        {
+            return;
+        }
+
+        if (IsTargetDestination())
+        {
+            _state = StrategyStatus.Finish;
+            return;
+        }
+
+        MoveToTarget();
+    }
+
+    /// <summary>
+    /// Перемещение влево
+    /// </summary>
+    /// <returns></returns>
+    protected bool MoveLeft() => MoveTo(MovementDirection.Left);
+
+    /// <summary>
+    /// Перемещение вправо
+    /// </summary>
+    /// <returns></returns>
+    protected bool MoveRight() => MoveTo(MovementDirection.Right);
+
+    /// <summary>
+    /// Перемещение вверх
+    /// </summary>
+    /// <returns></returns>
+    protected bool MoveUp() => MoveTo(MovementDirection.Up);
+
+    /// <summary>
+    /// Перемещение вниз
+    /// </summary>
+    /// <returns></returns>
+    protected bool MoveDown() => MoveTo(MovementDirection.Down);
+
+
+    protected ObjectParameters? GetObjectParameters => _moveableObject?.GetObjectPosition;
+
+
+    protected int? GetStep()
+    {
+        if (_state != StrategyStatus.InProgress)
+        {
+            return null;
+        }
+        return _moveableObject?.GetStep;
+    }
+
+
+
+    /// <summary>
+    /// Перемещение к цели
+    /// </summary>
+    protected abstract void MoveToTarget();
+
+    /// <summary>
+    /// Достигнута ли цель
+    /// </summary>
+    /// <returns></returns>
+    protected abstract bool IsTargetDestination();
+
+
+    private bool MoveTo(MovementDirection direction)
+    {
+        if (_state != StrategyStatus.InProgress)
+        {
+            return false;
+        }
+        return _moveableObject?.TryMoveObject(direction) ?? false;
+    }
+
+}
diff --git a/ProjectCruiser/ProjectCruiser/MovementStrategy/IMoveableObject.cs b/ProjectCruiser/ProjectCruiser/MovementStrategy/IMoveableObject.cs
new file mode 100644
index 0000000..fd23511
--- /dev/null
+++ b/ProjectCruiser/ProjectCruiser/MovementStrategy/IMoveableObject.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectCruiser.MovementStrategy;
+
+/// <summary>
+/// Интерфейс для работы с перемещением объектов
+/// </summary>
+public interface IMoveableObject
+{
+    /// <summary>
+    /// Получение координаты объекта
+    /// </summary>
+    ObjectParameters? GetObjectPosition { get; }
+
+    /// <summary>
+    /// Шаг объекта
+    /// </summary>
+    int GetStep {  get; }
+
+    /// <summary>
+    /// Попытка переместить объект в указанном направлении
+    /// </summary>
+    /// <param name="direction">Направление</param>
+    /// <returns></returns>
+    bool TryMoveObject(MovementDirection direction);
+}
diff --git a/ProjectCruiser/ProjectCruiser/MovementStrategy/MoveToBorder.cs b/ProjectCruiser/ProjectCruiser/MovementStrategy/MoveToBorder.cs
new file mode 100644
index 0000000..8469f08
--- /dev/null
+++ b/ProjectCruiser/ProjectCruiser/MovementStrategy/MoveToBorder.cs
@@ -0,0 +1,50 @@
+namespace ProjectCruiser.MovementStrategy;
+
+public class MoveToBorder : AbstactStrategy
+{
+    protected override bool IsTargetDestination()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return false;
+        }
+        return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth && objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth &&
+            objParams.ObjectMiddleVertical - GetStep() <= FieldHeight && objParams.ObjectMiddleVertical + GetStep() >= FieldHeight;
+    }
+
+    protected override void MoveToTarget()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return;
+        }
+
+        int diffX = objParams.ObjectMiddleHorizontal - FieldWidth;
+        if (Math.Abs(diffX) > GetStep())
+        {
+            if (diffX > 0)
+            {
+                MoveLeft();
+            }
+            else
+            {
+                MoveRight();
+            }
+        }
+
+        int diffY = objParams.ObjectMiddleVertical - FieldHeight;
+        if (Math.Abs(diffY) > GetStep())
+        {
+            if (diffY > 0)
+            {
+                MoveUp();
+            }
+            else
+            {
+                MoveDown();
+            }
+        }
+    }
+}
diff --git a/ProjectCruiser/ProjectCruiser/MovementStrategy/MoveToCenter.cs b/ProjectCruiser/ProjectCruiser/MovementStrategy/MoveToCenter.cs
new file mode 100644
index 0000000..c88b51e
--- /dev/null
+++ b/ProjectCruiser/ProjectCruiser/MovementStrategy/MoveToCenter.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectCruiser.MovementStrategy;
+
+public class MoveToCenter : AbstactStrategy
+{
+    protected override bool IsTargetDestination()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return false;
+        }
+        return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth / 2 && objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
+            objParams.ObjectMiddleVertical - GetStep() <= FieldHeight / 2 && objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
+    }
+
+    protected override void MoveToTarget()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return;
+        }
+
+        int diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
+        if (Math.Abs(diffX) > GetStep())
+        {
+            if (diffX > 0)
+            {
+                MoveLeft();
+            } else
+            {
+                MoveRight();
+            }
+        }
+
+        int diffY = objParams.ObjectMiddleVertical - FieldHeight / 2;
+        if (Math.Abs(diffY) > GetStep()) 
+        {
+            if (diffY > 0)
+            {
+                MoveUp();
+            } else
+            {
+                MoveDown();
+            }
+        }
+    }
+}
diff --git a/ProjectCruiser/ProjectCruiser/MovementStrategy/MoveableCruiser.cs b/ProjectCruiser/ProjectCruiser/MovementStrategy/MoveableCruiser.cs
new file mode 100644
index 0000000..4755f4d
--- /dev/null
+++ b/ProjectCruiser/ProjectCruiser/MovementStrategy/MoveableCruiser.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ProjectCruiser.Drawings;
+
+namespace ProjectCruiser.MovementStrategy;
+
+/// <summary>
+/// Класс реализация IMoveableObject с использованием DrawningCruiser
+/// </summary>
+public class MoveableCruiser : IMoveableObject
+{
+    /// <summary>
+    /// Поле-объект класса DrawningCruiser или его наследника
+    /// </summary>
+    private readonly DrawningCruiser? _cruiser = null;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="cruiser"></param>
+    public MoveableCruiser(DrawningCruiser? cruiser)
+    {
+        _cruiser = cruiser;
+    }
+    
+    public ObjectParameters? GetObjectPosition
+    {
+        get
+        {
+            if (_cruiser == null || _cruiser.EntityCruiser == null || !_cruiser.GetPosX.HasValue || !_cruiser.GetPosY.HasValue)
+            {
+                return null;
+            }
+            return new ObjectParameters(_cruiser.GetPosX.Value, _cruiser.GetPosY.Value, _cruiser.GetWidth, _cruiser.GetHeight);
+        }
+    }
+
+    public int GetStep => (int)(_cruiser?.EntityCruiser?.Step ?? 0);
+
+    public bool TryMoveObject(MovementDirection direction)
+    {
+        if (_cruiser == null || _cruiser.EntityCruiser == null)
+        {
+            return false;
+        }
+        return _cruiser.MoveTransport(GetDirectionType(direction));
+    }
+
+    /// <summary>
+    /// Конвертация из MovementDirection в DirectionType
+    /// </summary>
+    /// <param name="direction"></param>
+    /// <returns></returns>
+    private static DirectionType GetDirectionType(MovementDirection direction)
+    {
+        return direction switch
+        {
+            MovementDirection.Left => DirectionType.Left,
+            MovementDirection.Right => DirectionType.Right,
+            MovementDirection.Up => DirectionType.Up,
+            MovementDirection.Down => DirectionType.Down,
+            _ => DirectionType.Unknow,
+        };
+    }
+}
diff --git a/ProjectCruiser/ProjectCruiser/MovementStrategy/MovementDirection.cs b/ProjectCruiser/ProjectCruiser/MovementStrategy/MovementDirection.cs
new file mode 100644
index 0000000..2d6fe5f
--- /dev/null
+++ b/ProjectCruiser/ProjectCruiser/MovementStrategy/MovementDirection.cs
@@ -0,0 +1,24 @@
+namespace ProjectCruiser.MovementStrategy;
+
+/// <summary>
+/// Направление перемещения
+/// </summary>
+public enum MovementDirection
+{
+    /// <summary>
+    /// Вверх
+    /// </summary>
+    Up = 1,
+    /// <summary>
+    /// Вниз
+    /// </summary>
+    Down = 2,
+    /// <summary>
+    /// Влева
+    /// </summary>
+    Left = 3,
+    /// <summary>
+    /// Вправо
+    /// </summary>
+    Right = 4
+}
diff --git a/ProjectCruiser/ProjectCruiser/MovementStrategy/ObjectParameters.cs b/ProjectCruiser/ProjectCruiser/MovementStrategy/ObjectParameters.cs
new file mode 100644
index 0000000..dd28ac0
--- /dev/null
+++ b/ProjectCruiser/ProjectCruiser/MovementStrategy/ObjectParameters.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectCruiser.MovementStrategy;
+/// <summary>
+/// Параметры координаты объекта
+/// </summary>
+public class ObjectParameters
+{
+    /// <summary>
+    /// Координата X
+    /// </summary>
+    private readonly int _x;
+
+    /// <summary>
+    /// Координата Y
+    /// </summary>
+    private readonly int _y;
+
+    /// <summary>
+    /// Ширина объекта
+    /// </summary>
+    private readonly int _width;
+
+    /// <summary>
+    /// Высота объекта
+    /// </summary>
+    private readonly int _height;
+
+    /// <summary>
+    /// Левая граница
+    /// </summary>
+    public int LeftBorder => _x;
+
+    /// <summary>
+    /// Верхняя граница
+    /// </summary>
+    public int TopBorder => _y;
+
+    /// <summary>
+    /// Правая граница
+    /// </summary>
+    public int RightBorder => _x + _width;
+
+    /// <summary>
+    /// Нижняя граница
+    /// </summary>
+    public int DownBorder => _y + _height;
+
+    /// <summary>
+    /// Середина объекта
+    /// </summary>
+    public int ObjectMiddleHorizontal => _x + _width / 2;
+
+    /// <summary>
+    /// Середина объекта
+    /// </summary>
+    public int ObjectMiddleVertical => _y + _height / 2;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="x"></param>
+    /// <param name="y"></param>
+    /// <param name="width"></param>
+    /// <param name="height"></param>
+    public ObjectParameters(int x, int y, int width, int height)
+    {
+        _x = x;
+        _y = y;
+        _width = width;
+        _height = height;
+    }
+}
diff --git a/ProjectCruiser/ProjectCruiser/MovementStrategy/StrategyStatus.cs b/ProjectCruiser/ProjectCruiser/MovementStrategy/StrategyStatus.cs
new file mode 100644
index 0000000..d769b40
--- /dev/null
+++ b/ProjectCruiser/ProjectCruiser/MovementStrategy/StrategyStatus.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectCruiser.MovementStrategy;
+
+/// <summary>
+/// Статус выполнения операции перемещения
+/// </summary>
+public enum StrategyStatus
+{
+    /// <summary>
+    /// Все готово к началу
+    /// </summary>
+    NotInit,
+    /// <summary>
+    /// Выполняется
+    /// </summary>
+    InProgress,
+    /// <summary>
+    /// Завершено
+    /// </summary>
+    Finish
+}
-- 
2.25.1


From 801caf48d30b903b2a52d8d1899de91999ccfda0 Mon Sep 17 00:00:00 2001
From: Almaz <79022113685@mail.ru>
Date: Wed, 10 Apr 2024 00:34:32 +0400
Subject: [PATCH 5/6] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=80=D0=B8=D1=81?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=BA=D1=80=D0=B5=D0=B9=D1=81=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Drawings/DrawningCruiser.cs               | 31 ++++++-----
 .../Drawings/DrawningMilitaryCruiser.cs       | 51 +++++++++----------
 2 files changed, 38 insertions(+), 44 deletions(-)

diff --git a/ProjectCruiser/ProjectCruiser/Drawings/DrawningCruiser.cs b/ProjectCruiser/ProjectCruiser/Drawings/DrawningCruiser.cs
index ea8c06f..7fee537 100644
--- a/ProjectCruiser/ProjectCruiser/Drawings/DrawningCruiser.cs
+++ b/ProjectCruiser/ProjectCruiser/Drawings/DrawningCruiser.cs
@@ -34,11 +34,11 @@ public class DrawningCruiser
     /// <summary>
     /// Ширина прорисовки крейсера
     /// </summary>
-    private readonly int _drawningCruiserWidth = 90;
+    private readonly int _drawningCruiserWidth = 180;
     /// <summary>
     /// Высота прорисовки крейсера
     /// </summary>
-    private readonly int _drawingCruiserHeight = 50;
+    private readonly int _drawingCruiserHeight = 70;
 
     /// <summary>
     /// Координата X объекта
@@ -158,21 +158,20 @@ public class DrawningCruiser
 
         Pen pen = new(Color.Black);
 
+        // Основной корпус крейсера 
+        Brush Brush = new
+        SolidBrush(EntityCruiser.BodyColor);
 
-        //Границы крейсера
-        g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value, 20, 20);
-        g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value + 30, 20, 20);
-        g.DrawEllipse(pen, _startPosX.Value + 70, _startPosY.Value, 20, 20);
-        g.DrawEllipse(pen, _startPosX.Value + 70, _startPosY.Value + 30, 20, 20);
-        g.DrawRectangle(pen, _startPosX.Value + 1, _startPosY.Value + 10, 10, 30);
-        g.DrawRectangle(pen, _startPosX.Value + 80, _startPosY.Value + 10, 10, 30);
-        g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 1, 70, 52);
-
-        //кузов крейсера
-        Brush br = new SolidBrush(EntityCruiser.BodyColor);
-        g.FillRectangle(br, _startPosX.Value, _startPosY.Value + 10, 10, 30);
-        g.FillRectangle(br, _startPosX.Value + 80, _startPosY.Value + 10, 10, 30);
-        g.FillRectangle(br, _startPosX.Value + 10, _startPosY.Value, 70, 50);
+        Point[] hull = new Point[]
+        {
+                new Point((int)(_startPosX + 5), (int)(_startPosY + 10)),
+                new Point((int)(_startPosX + 110), (int)(_startPosY + 10)),
+                new Point((int)(_startPosX + 170), (int)(_startPosY + 40)),
+                new Point((int)(_startPosX + 110), (int)(_startPosY + 60)),
+                new Point((int)(_startPosX + 5), (int)(_startPosY + 60))
+        };
+        g.FillPolygon(Brush, hull);
+        g.DrawPolygon(pen, hull);
 
     }
 }
diff --git a/ProjectCruiser/ProjectCruiser/Drawings/DrawningMilitaryCruiser.cs b/ProjectCruiser/ProjectCruiser/Drawings/DrawningMilitaryCruiser.cs
index b86968c..9409d28 100644
--- a/ProjectCruiser/ProjectCruiser/Drawings/DrawningMilitaryCruiser.cs
+++ b/ProjectCruiser/ProjectCruiser/Drawings/DrawningMilitaryCruiser.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -19,7 +20,7 @@ public class DrawningMilitaryCruiser: DrawningCruiser
     /// <param name="bodyKit">Признак наличия обвеса</param>
     /// <param name="armor">Признак наличия брони</param>
     /// <param name="weapon">Признак наличия оружия</param>
-    public DrawningMilitaryCruiser(int speed, double weigth, Color bodyColor, Color additionalColor, bool bodyKit, bool armor, bool weapon): base(110, 60)
+    public DrawningMilitaryCruiser(int speed, double weigth, Color bodyColor, Color additionalColor, bool bodyKit, bool armor, bool weapon): base(180, 70)
     {
         EntityCruiser = new EntityMilitaryCruiser(speed, weigth, bodyColor, additionalColor, bodyKit, armor, weapon);
     }
@@ -33,36 +34,30 @@ public class DrawningMilitaryCruiser: DrawningCruiser
         }
 
         Pen pen = new(Color.Black);
-        Brush additionalBrush = new SolidBrush(militaryCruiser.AdditionalColor);
 
-        //Границы крейсера
-        g.DrawEllipse(pen, _startPosX.Value + 10, _startPosY.Value + 5, 20, 20);
-        g.DrawEllipse(pen, _startPosX.Value + 10, _startPosY.Value + 35, 20, 20);
-        g.DrawEllipse(pen, _startPosX.Value + 80, _startPosY.Value + 5, 20, 20);
-        g.DrawEllipse(pen, _startPosX.Value + 80, _startPosY.Value + 35, 20, 20);
-        g.DrawRectangle(pen, _startPosX.Value + 9, _startPosY.Value + 15, 10, 30);
-        g.DrawRectangle(pen, _startPosX.Value + 90, _startPosY.Value + 15, 10, 30);
-        g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 4, 70, 52);
+       // Основной корпус парусника 
+       Brush brush = new SolidBrush(militaryCruiser.BodyColor);
 
-        //кузов крейсера
-        Brush br = new SolidBrush(militaryCruiser.BodyColor);
-        g.FillRectangle(br, _startPosX.Value + 10, _startPosY.Value + 15, 10, 30);
-        g.FillRectangle(br, _startPosX.Value + 90, _startPosY.Value + 15, 10, 30);
-        g.FillRectangle(br, _startPosX.Value + 20, _startPosY.Value + 5, 70, 50);
-
-        _startPosX += 10;
-        _startPosY += 5;
-        base.DrawTransport(g);
-        _startPosX -= 10;
-        _startPosY -= 5;
-
-        // оружие крейсера
-        if (militaryCruiser.Weapon)
+       Point[] hull = new Point[]
         {
-            g.FillRectangle(additionalBrush, _startPosX.Value + 75, _startPosY.Value + 23, 25, 15);
-            g.FillRectangle(additionalBrush, _startPosX.Value + 35, _startPosY.Value + 23, 35, 15);
-            g.FillRectangle(additionalBrush, _startPosX.Value + 10, _startPosY.Value + 23, 20, 15);
+                new Point((int)(_startPosX + 5), (int)(_startPosY + 10)),
+                new Point((int)(_startPosX + 110), (int)(_startPosY + 10)),
+                new Point((int)(_startPosX + 170), (int)(_startPosY + 40)),
+                new Point((int)(_startPosX + 110), (int)(_startPosY + 60)),
+                new Point((int)(_startPosX + 5), (int)(_startPosY + 60))
+        };
+        g.FillPolygon(brush, hull);
+        g.DrawPolygon(pen, hull);
+        base.DrawTransport(g);
+
+        //Взлетная полоса
+        Brush additionalBrush = new SolidBrush(militaryCruiser.AdditionalColor);
+        g.FillEllipse(additionalBrush, (int)(_startPosX + 100), (int)(_startPosY + 25), 20, 20);
+        g.DrawEllipse(pen, (int)(_startPosX + 100), (int)(_startPosY + 25), 20, 20);
+
+        //Рокетная шахта
+        g.FillRectangle(additionalBrush, (int)(_startPosX + 70), (int)(_startPosY + 20), 20, 30);
+        g.FillRectangle(additionalBrush, (int)(_startPosX + 40), (int)(_startPosY + 27), 30, 15);
 
-        }
     }
 }
-- 
2.25.1


From 2238e92799cf89b3591efa1b19782bdc2e3c1bab Mon Sep 17 00:00:00 2001
From: Almaz <79022113685@mail.ru>
Date: Mon, 15 Apr 2024 17:32:53 +0400
Subject: [PATCH 6/6] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B0=20DrawningCruiser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ProjectCruiser/ProjectCruiser/Drawings/DrawningCruiser.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ProjectCruiser/ProjectCruiser/Drawings/DrawningCruiser.cs b/ProjectCruiser/ProjectCruiser/Drawings/DrawningCruiser.cs
index 7fee537..e3cdcbb 100644
--- a/ProjectCruiser/ProjectCruiser/Drawings/DrawningCruiser.cs
+++ b/ProjectCruiser/ProjectCruiser/Drawings/DrawningCruiser.cs
@@ -133,13 +133,13 @@ public class DrawningCruiser
                 }
                 return true;
             case DirectionType.Right:
-                if (_startPosX.Value - EntityCruiser.Step > 0)
+                if (_startPosX.Value + _drawningCruiserWidth + EntityCruiser.Step < _pictureWidth)
                 {
                     _startPosX += (int)EntityCruiser.Step;
                 }
                 return true;
             case DirectionType.Down:
-                if (_startPosY.Value - EntityCruiser.Step > 0)
+                if (_startPosY.Value + _drawingCruiserHeight + EntityCruiser.Step < _pictureHeight)
                 {
                     _startPosY += (int)EntityCruiser.Step;
                 }
-- 
2.25.1