fix

Пофиксила
2023-11-04 15:00:35 +04:00 · 2023-11-03 22:17:15 +04:00
17 changed files with 153 additions and 449 deletions
--- a/Cruiser/Cruiser/AbstractStrategy.cs
+++ b/Cruiser/Cruiser/AbstractStrategy.cs
@@ -3,35 +3,16 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
-
 namespace Cruiser.MovementStrategy
 {
    public abstract class AbstractStrategy
    {
        private IMoveableObject? _moveableObject;
-        /// <summary>
-        /// Статус перемещения
-        /// </summary>
        private Status _state = Status.NotInit;
-        /// <summary>
-        /// Ширина поля
-        /// </summary>
        protected int FieldWidth { get; private set; }
-        /// <summary>
-        /// Высота поля
-        /// </summary>
        protected int FieldHeight { get; private set; }
-        /// <summary>
-        /// Статус перемещения
-        /// </summary>
        public Status 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)
        {
@@ -45,9 +26,6 @@ namespace Cruiser.MovementStrategy
            FieldWidth = width;
            FieldHeight = height;
        }
-        /// <summary>
-        /// Шаг перемещения
-        /// </summary>
        public void MakeStep()
        {
            if (_state != Status.InProgress)
@@ -61,35 +39,12 @@ namespace Cruiser.MovementStrategy
            }
            MoveToTarget();
        }
-        /// <summary>
-        /// Перемещение влево
-        /// </summary>
-        /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
        protected bool MoveLeft() => MoveTo(Direction.Left);
-        /// <summary>
-        /// Перемещение вправо
-        /// </summary>
-        /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
        protected bool MoveRight() => MoveTo(Direction.Right);
-        /// <summary>
-        /// Перемещение вверх
-        /// </summary>
-        /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
        protected bool MoveUp() => MoveTo(Direction.Up);
-        /// <summary>
-        /// Перемещение вниз
-        /// </summary>
-        /// <returns>Результат перемещения (true - удалось переместиться,false - неудача)</returns>
        protected bool MoveDown() => MoveTo(Direction.Down);
-        /// <summary>
-        /// Параметры объекта
-        /// </summary>
        protected ObjectParameters? GetObjectParameters =>
               _moveableObject?.GetObjectPosition;
-        /// <summary>
-        /// Шаг объекта
-        /// </summary>
-        /// <returns></returns>
        protected int? GetStep()
        {
            if (_state != Status.InProgress)
@@ -98,33 +53,20 @@ namespace Cruiser.MovementStrategy
            }
            return _moveableObject?.GetStep;
        }
-        /// <summary>
-        /// Перемещение к цели
-        /// </summary>
        protected abstract void MoveToTarget();
-        /// <summary>
-        /// Достигнута ли цель
-        /// </summary>
-        /// <returns></returns>
        protected abstract bool IsTargetDestinaion();
-        /// <summary>
-        /// Попытка перемещения в требуемом направлении
-        /// </summary>
-        /// <param name="directionType">Направление</param>
-        /// <returns>Результат попытки (true - удалось переместиться, false - неудача)</returns>
-        private bool MoveTo(Direction directionType)
+        private bool MoveTo(Direction direction)
        {
            if (_state != Status.InProgress)
            {
                return false;
            }
-            if (_moveableObject?.CheckCanMove(directionType) ?? false)
+            if (_moveableObject?.CheckCanMove(direction) ?? false)
            {
-                _moveableObject.MoveObject(directionType);
+                _moveableObject.MoveObject(direction);
                return true;
            }
            return false;
        }
    }
 }
-    
--- a/Cruiser/Cruiser/CruiserForm.Designer.cs
+++ b/Cruiser/Cruiser/CruiserForm.Designer.cs
@@ -2,60 +2,31 @@
 {
    partial class CruiserForm
    {
-        /// <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>
-       
-
        #region Windows Form Designer generated code
-
-        /// <summary>
-        ///  Required method for Designer support - do not modify
-        ///  the contents of this method with the code editor.
-        /// </summary>
        private void InitializeComponent()
        {
-            this.button1 = new System.Windows.Forms.Button();
-            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.pictureBoxCruiser = new System.Windows.Forms.PictureBox();
            this.buttonDown = new System.Windows.Forms.Button();
            this.buttonLeft = new System.Windows.Forms.Button();
            this.buttonRight = new System.Windows.Forms.Button();
            this.buttonUp = new System.Windows.Forms.Button();
+            this.buttonAdvancedCreate = new System.Windows.Forms.Button();
            this.buttonCreate = new System.Windows.Forms.Button();
-            this.button2 = new System.Windows.Forms.Button();
-            this.comboBox1 = new System.Windows.Forms.ComboBox();
+            this.comboBoxCruiser = new System.Windows.Forms.ComboBox();
            this.ButtonStep = new System.Windows.Forms.Button();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCruiser)).BeginInit();
            this.SuspendLayout();
-            // 
-            // button1
-            // 
-            this.button1.Location = new System.Drawing.Point(386, 68);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(112, 34);
-            this.button1.TabIndex = 0;
-            this.button1.Text = "button1";
-            this.button1.UseVisualStyleBackColor = true;
-            // 
-            // pictureBox1
-            // 
-            this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBox1.Location = new System.Drawing.Point(0, 0);
-            this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(667, 358);
-            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBox1.TabIndex = 0;
-            this.pictureBox1.TabStop = false;
-            this.pictureBox1.Click += new System.EventHandler(this.buttonMove_Click);
-            // 
+            // pictureBoxCruiser
+            this.pictureBoxCruiser.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pictureBoxCruiser.Location = new System.Drawing.Point(0, 0);
+            this.pictureBoxCruiser.Name = "pictureBoxCruiser";
+            this.pictureBoxCruiser.Size = new System.Drawing.Size(667, 358);
+            this.pictureBoxCruiser.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+            this.pictureBoxCruiser.TabIndex = 0;
+            this.pictureBoxCruiser.TabStop = false;
+            this.pictureBoxCruiser.Click += new System.EventHandler(this.buttonMove_Click);
            // buttonDown
-            // 
            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
            this.buttonDown.BackgroundImage = global::Cruiser.Properties.Resources.вниз;
            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
@@ -65,9 +36,7 @@
            this.buttonDown.TabIndex = 1;
            this.buttonDown.UseVisualStyleBackColor = true;
            this.buttonDown.Click += new System.EventHandler(this.buttonMove_Click);
-            // 
            // buttonLeft
-            // 
            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
            this.buttonLeft.BackgroundImage = global::Cruiser.Properties.Resources.влево;
            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
@@ -77,9 +46,7 @@
            this.buttonLeft.TabIndex = 2;
            this.buttonLeft.UseVisualStyleBackColor = true;
            this.buttonLeft.Click += new System.EventHandler(this.buttonMove_Click);
-            // 
            // buttonRight
-            // 
            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
            this.buttonRight.BackgroundImage = global::Cruiser.Properties.Resources.вправо;
            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
@@ -89,9 +56,7 @@
            this.buttonRight.TabIndex = 3;
            this.buttonRight.UseVisualStyleBackColor = true;
            this.buttonRight.Click += new System.EventHandler(this.buttonMove_Click);
-            // 
            // buttonUp 
-            // 
            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
            this.buttonUp.BackgroundImage = global::Cruiser.Properties.Resources.вверх;
            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
@@ -101,43 +66,35 @@
            this.buttonUp.TabIndex = 4;
            this.buttonUp.UseVisualStyleBackColor = true;
            this.buttonUp.Click += new System.EventHandler(this.buttonMove_Click);
-            // 
+            // buttonAdvancedCreate
+            this.buttonAdvancedCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.buttonAdvancedCreate.Location = new System.Drawing.Point(12, 267);
+            this.buttonAdvancedCreate.Name = "buttonAdvancedCreate";
+            this.buttonAdvancedCreate.Size = new System.Drawing.Size(210, 69);
+            this.buttonAdvancedCreate.TabIndex = 5;
+            this.buttonAdvancedCreate.Text = "Создать продвинутую версию";
+            this.buttonAdvancedCreate.UseVisualStyleBackColor = true;
+            this.buttonAdvancedCreate.Click += new System.EventHandler(this.buttonAdvancedCreate_Click);
            // buttonCreate
-            // 
            this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreate.Location = new System.Drawing.Point(0, 302);
+            this.buttonCreate.Location = new System.Drawing.Point(240, 267);
            this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(218, 34);
-            this.buttonCreate.TabIndex = 5;
-            this.buttonCreate.Text = "Создать Про версию";
+            this.buttonCreate.Size = new System.Drawing.Size(242, 69);
+            this.buttonCreate.TabIndex = 6;
+            this.buttonCreate.Text = "Создать простую версию";
            this.buttonCreate.UseVisualStyleBackColor = true;
            this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click);
-            // 
-            // button2
-            // 
-            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.button2.Location = new System.Drawing.Point(210, 301);
-            this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(251, 37);
-            this.button2.TabIndex = 6;
-            this.button2.Text = "Создать простую версию";
-            this.button2.UseVisualStyleBackColor = true;
-            this.button2.Click += new System.EventHandler(this.button2_Click);
-            // 
-            // comboBox1
-            // 
-            this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBox1.FormattingEnabled = true;
-            this.comboBox1.Items.AddRange(new object[] {
+            // comboBoxCruiser
+            this.comboBoxCruiser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxCruiser.FormattingEnabled = true;
+            this.comboBoxCruiser.Items.AddRange(new object[] {
            "Центр",
            "Угол"});
-            this.comboBox1.Location = new System.Drawing.Point(415, 22);
-            this.comboBox1.Name = "comboBox1";
-            this.comboBox1.Size = new System.Drawing.Size(182, 33);
-            this.comboBox1.TabIndex = 7;
-            // 
+            this.comboBoxCruiser.Location = new System.Drawing.Point(415, 22);
+            this.comboBoxCruiser.Name = "comboBoxCruiser";
+            this.comboBoxCruiser.Size = new System.Drawing.Size(182, 33);
+            this.comboBoxCruiser.TabIndex = 7;
            // ButtonStep
-            // 
            this.ButtonStep.Location = new System.Drawing.Point(485, 70);
            this.ButtonStep.Name = "ButtonStep";
            this.ButtonStep.Size = new System.Drawing.Size(112, 34);
@@ -145,38 +102,33 @@
            this.ButtonStep.Text = "Шаг";
            this.ButtonStep.UseVisualStyleBackColor = true;
            this.ButtonStep.Click += new System.EventHandler(this.ButtonStep_Click);
-            // 
            // CruiserForm
-            // 
            this.ClientSize = new System.Drawing.Size(667, 358);
            this.Controls.Add(this.ButtonStep);
-            this.Controls.Add(this.comboBox1);
-            this.Controls.Add(this.button2);
+            this.Controls.Add(this.comboBoxCruiser);
            this.Controls.Add(this.buttonCreate);
+            this.Controls.Add(this.buttonAdvancedCreate);
            this.Controls.Add(this.buttonUp);
            this.Controls.Add(this.buttonRight);
            this.Controls.Add(this.buttonLeft);
            this.Controls.Add(this.buttonDown);
-            this.Controls.Add(this.pictureBox1);
+            this.Controls.Add(this.pictureBoxCruiser);
            this.Name = "CruiserForm";
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCruiser)).EndInit();
            this.ResumeLayout(false);
            this.PerformLayout();

        }
-        /// <param name="e"></param>

-#endregion
-
-private Button button1;
-        private PictureBox pictureBox1;
+        #endregion
+        private PictureBox pictureBoxCruiser;
        private Button buttonDown;
        private Button buttonLeft;
        private Button buttonRight;
        private Button buttonUp;
+        private Button buttonAdvancedCreate;
        private Button buttonCreate;
-        private Button button2;
-        private ComboBox comboBox1;
+        private ComboBox comboBoxCruiser;
        private Button ButtonStep;
    }
 }
--- a/Cruiser/Cruiser/CruiserForm.cs
+++ b/Cruiser/Cruiser/CruiserForm.cs
@@ -1,11 +1,9 @@
 using System.Windows.Forms;
 using Cruiser.DrawningObjects;
-
 using Cruiser.MovementStrategy;

 namespace Cruiser
 {
-
    public partial class CruiserForm : Form
    {
        private DrawningCruiser? _drawningCruiser;
@@ -21,10 +19,10 @@ namespace Cruiser
            {
                return;
            }
-            Bitmap bmp = new Bitmap(pictureBox1.Width, pictureBox1.Height);
+            Bitmap bmp = new Bitmap(pictureBoxCruiser.Width, pictureBoxCruiser.Height);
            Graphics gr = Graphics.FromImage(bmp);
            _drawningCruiser.DrawTransport(gr);
-            pictureBox1.Image = bmp;
+            pictureBoxCruiser.Image = bmp;
        }
        private void buttonMove_Click(object sender, EventArgs e)
        {
@@ -50,33 +48,27 @@ namespace Cruiser
            }
            Draw();
        }
-
-        private void button2_Click(object sender, EventArgs e)
+        private void buttonCreate_Click(object sender, EventArgs e)
        {
            Random random = new();
            _drawningCruiser = new DrawningCruiser(random.Next(100, 300),
            random.Next(1000, 3000),
            Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
            random.Next(0, 256)),
-            pictureBox1.Width, pictureBox1.Height);
+            pictureBoxCruiser.Width, pictureBoxCruiser.Height);
            _drawningCruiser.SetPosition(random.Next(10, 100), random.Next(10,
            100));
            Draw();
        }
-
-
-    
-
-
    private void ButtonStep_Click(object sender, EventArgs e)
        {
            if (_drawningCruiser == null)
            {
                return;
            }
-            if (comboBox1.Enabled)
+            if (comboBoxCruiser.Enabled)
            {
-                _abstractStrategy = comboBox1.SelectedIndex
+                _abstractStrategy = comboBoxCruiser.SelectedIndex
                switch
                {
                    0 => new MoveToCenter(),
@@ -87,9 +79,9 @@ namespace Cruiser
                {
                    return;
                }
-                _abstractStrategy.SetData(new DrawningObjectCar(_drawningCruiser), pictureBox1.Width,
-                pictureBox1.Height);
-                comboBox1.Enabled = false;
+                _abstractStrategy.SetData(new DrawningObjectCruiser(_drawningCruiser), pictureBoxCruiser.Width,
+                pictureBoxCruiser.Height);
+                comboBoxCruiser.Enabled = false;
            }
            if (_abstractStrategy == null)
            {
@@ -99,15 +91,14 @@ namespace Cruiser
            Draw();
            if (_abstractStrategy.GetStatus() == Status.Finish)
            {
-                comboBox1.Enabled = true;
+                comboBoxCruiser.Enabled = true;
                _abstractStrategy = null;
            }
        }
-
-        private void buttonCreate_Click(object sender, EventArgs e)
+        private void buttonAdvancedCreate_Click(object sender, EventArgs e)
        {
            Random random = new();
-            _drawningCruiser = new DrawningPro(random.Next(100, 300),
+            _drawningCruiser = new DrawningAdvancedCruiser(random.Next(100, 300),
            random.Next(1000, 3000),
            Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
            random.Next(0, 256)),
@@ -117,16 +108,10 @@ namespace Cruiser
            Convert.ToBoolean(random.Next(0, 2)),
            Convert.ToBoolean(random.Next(0, 2)),

-            pictureBox1.Width, pictureBox1.Height);
+            pictureBoxCruiser.Width, pictureBoxCruiser.Height);
            _drawningCruiser.SetPosition(random.Next(10, 100), random.Next(10,
            100));
            Draw();
        }
    }
 }
-
-
-
-
-
-
--- a/Cruiser/Cruiser/CruiserForm.resx
+++ b/Cruiser/Cruiser/CruiserForm.resx
--- a/Cruiser/Cruiser/Direction.cs
+++ b/Cruiser/Cruiser/Direction.cs
@@ -3,28 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
 namespace Cruiser
 {
    public enum Direction
    {
-        /// Вверх
-
-        /// </summary>
        Up = 1,
-        /// <summary>
-        /// Вниз
-        /// </summary>
        Down = 2,
-        /// <summary>
-        /// Влево
-        /// </summary>
        Left = 3,
-        /// <summary>
-        /// Вправо
-        /// </summary>
        Right = 4
    }
 }
-
-
--- a/Cruiser/Cruiser/DrawningAdvancedCruiser.cs
+++ b/Cruiser/Cruiser/DrawningAdvancedCruiser.cs
@@ -5,56 +5,44 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Cruiser.Entities;
-using Cruiser;
-
 namespace Cruiser.DrawningObjects
 {
-   
-    public class DrawningPro : DrawningCruiser
+    public class DrawningAdvancedCruiser : DrawningCruiser
    {
-        public DrawningPro(int speed, double weight, Color bodyColor, Color additionalColor, bool headlights, bool helicopterPad, bool coating, int width, int height) : base(speed, weight, bodyColor, width, height, 150, 50)
+        public DrawningAdvancedCruiser(int speed, double weight, Color bodyColor, Color additionalColor, bool headlights, bool helicopterPad, bool coating, int width, int height) : base(speed, weight, bodyColor, width, height, 150, 50)
        {
            if (EntityCruiser != null)
            {
-                EntityCruiser = new Pro(speed, weight, bodyColor, additionalColor, headlights, helicopterPad, coating);
+                EntityCruiser = new EntityAdvancedCruiser(speed, weight, bodyColor, additionalColor, headlights, helicopterPad, coating);
            }
        }
        public override void DrawTransport(Graphics g)
        {
-            if (EntityCruiser is not Pro cruiser)
+            if (EntityCruiser is not EntityAdvancedCruiser cruiser)
            {
                return;
            }
-
            Pen pen = new Pen(Color.Black);
            Brush addBrush = new SolidBrush(cruiser.AdditionalColor);
            Brush brush = new SolidBrush(cruiser.BodyColor);
-
            base.DrawTransport(g);
            if (cruiser.Headlights)
            {
-
                Brush brYellow = new SolidBrush(Color.Yellow);
                g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 5, 20,
                20);
                g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 35, 20,
                20);
            }
-
            if (cruiser.HelicopterPad)
            { 
-                //если есть площадка под вертолет
-                
                g.FillEllipse(Brushes.Green, _startPosX + 90, _startPosY + 20, 20, 20);
-
            }
-           
-            /* if (cruiser.Coating)
+            if (cruiser.Coating)
            {
-                //если есть спец покрытие для площадки под вертолет
-                g.FillEllipse(Brushes.Red, _startPosX + 90, _startPosY + 20, 20, 20);
-            }*/
+                g.FillEllipse(Brushes.Red, _startPosX + 80, _startPosY + 20, 20, 20);
+                g.FillEllipse(Brushes.Red, _startPosX + 60, _startPosY + 20, 20, 20);
+            }
        }
    }
 }
-
--- a/Cruiser/Cruiser/DrawningCruiser.cs
+++ b/Cruiser/Cruiser/DrawningCruiser.cs
@@ -11,7 +11,6 @@ namespace Cruiser.DrawningObjects
    {

        public EntityCruiser ? EntityCruiser { get; protected set; }
-
        private int _pictureWidth;

        private int _pictureHeight;
@@ -22,31 +21,12 @@ namespace Cruiser.DrawningObjects

        private readonly int _cruiserWidth = 150;

-
        private readonly int _cruiserHeight = 50;
-
        public int GetPosX => _startPosX;
-        /// <summary>
-        /// Координата Y объекта
-        /// </summary>
        public int GetPosY => _startPosY;
-        /// <summary>
-        /// Ширина объекта
-        /// </summary>
        public int GetWidth => _cruiserWidth;
-        /// <summary>
-        /// Высота объекта
-        /// </summary>
        public int GetHeight => _cruiserHeight;
        
-
-
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес</param>
-        /// <param name="bodyColor">Цвет кузова</param>
-        /// <param name="width">Ширина картинки</param>
-        /// <param name="height">Высота картинки</param>
-        
        public DrawningCruiser(int speed, double weight, Color bodyColor, int width, int height)
        {
            if (width < _cruiserWidth || height < _cruiserHeight)
@@ -55,15 +35,10 @@ namespace Cruiser.DrawningObjects
            }
            _pictureWidth = width;
            _pictureHeight = height;
-
            EntityCruiser = new EntityCruiser(speed, weight, bodyColor);
-
-
-
        }
-
        protected DrawningCruiser(int speed, double weight, Color bodyColor, int
-width, int height, int carWidth, int carHeight)
+width, int height, int cruiserWidth, int cruiserHeight)
        {
            if (width <= _cruiserWidth || height <= _cruiserHeight)
            {
@@ -71,33 +46,23 @@ width, int height, int carWidth, int carHeight)
            }
            _pictureWidth = width;
            _pictureHeight = height;
-            _cruiserWidth = carWidth;
-            _cruiserHeight = carHeight;
+            _cruiserWidth = cruiserWidth;
+            _cruiserHeight = cruiserHeight;
            EntityCruiser = new EntityCruiser(speed, weight, bodyColor);
        }
-
-
-
-
-
-
-        
-
-        /// <param name="x">Координата X</param>
-        /// <param name="y">Координата Y</param>
        public void SetPosition(int x, int y)
        {
-            if (x < 0 || x >= _pictureWidth || y < 0 || y >= _pictureHeight)
+            if (x < 0 || x + _cruiserWidth > _pictureWidth)
            {
-                _startPosX = 0;
-                _startPosY = 0;
+                x = Math.Max(0, _pictureWidth - _cruiserWidth);
+            }
+            if (y < 0 || y + _cruiserHeight > _pictureHeight)
+            {
+                y = Math.Max(0, _pictureHeight - _cruiserHeight);
            }
            _startPosX = x;
            _startPosY = y;
-           
        }
-
-        /// <param name="direction">Направление</param>
        public void MoveTransport(Direction direction)
        {
            if (!CanMove(direction) || EntityCruiser == null)
@@ -106,25 +71,18 @@ width, int height, int carWidth, int carHeight)
            }
            switch (direction)
            {
-                //влево
                case Direction.Left:
                    _startPosX -= (int)EntityCruiser.Step;
                    break;
-                //вверх
                case Direction.Up:
                    _startPosY -= (int)EntityCruiser.Step;
                    break;
-                // вправо
                case Direction.Right:
                    _startPosX += (int)EntityCruiser.Step;
                    break;
-                //вниз
                case Direction.Down:
                    _startPosY += (int)EntityCruiser.Step;
                    break;
-
-
-
            }
        }
        public bool CanMove(Direction direction)
@@ -135,19 +93,13 @@ width, int height, int carWidth, int carHeight)
            }
            return direction switch
            {
-                //влево
                Direction.Left => _startPosX - EntityCruiser.Step > 0,
-                //вверх
                Direction.Up => _startPosY - EntityCruiser.Step > 0,
-                // вправо
                Direction.Right => _startPosX + EntityCruiser.Step + _cruiserWidth < _pictureWidth,
-                //вниз
                Direction.Down => _startPosY + EntityCruiser.Step + _cruiserHeight < _pictureHeight,
                _ => false,
            };
        }
-
-        /// <param name="g"></param>
        public virtual void DrawTransport(Graphics g)
        {
            if (EntityCruiser == null)
@@ -156,70 +108,34 @@ width, int height, int carWidth, int carHeight)
            }
            Pen pen = new Pen(Color.Black);
            Brush brush = new SolidBrush(EntityCruiser.BodyColor);
-            //SolidBrush(Cruiser.AdditionalColor);
-
-
-            //границы автомобиля
-
-
            g.DrawEllipse(pen, _startPosX + 15, _startPosY + 5, 20, 20);
            g.DrawEllipse(pen, _startPosX + 15, _startPosY + 35, 20, 20);
            g.DrawRectangle(pen, _startPosX + 9, _startPosY + 15, 10, 30);
            g.DrawRectangle(pen, _startPosX + 90, _startPosY + 15, 10,
           30);
            g.DrawRectangle(pen, _startPosX + 20, _startPosY + 4, 70, 52);
-
-            //если есть доп.фонари
-           /* if (Cruiser.Headlights)
-            {
-
-                Brush brYellow = new SolidBrush(Color.Yellow);
-                g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 5, 20,
-                20);
-                g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 35, 20,
-                20);
-            }*/
-            //основание лодки!!!
            Brush br = new SolidBrush(EntityCruiser.BodyColor);
            g.FillRectangle(br, _startPosX + 10, _startPosY + 15, 10, 30);
            g.FillRectangle(br, _startPosX + 90, _startPosY + 15, 10, 30);
            g.FillRectangle(br, _startPosX + 20, _startPosY + 5, 70, 50);
-            Point[] points = new Point[3];// нос лодки
+            Point[] points = new Point[3];
            points[0] = new Point(_startPosX + 100, _startPosY + 5);
            points[1] = new Point(_startPosX + 100, _startPosY + 55);
            points[2] = new Point(_startPosX + 100 + 50, _startPosY + 50 / 2);
            g.FillPolygon(Brushes.Pink, points);
-            //границы носа лодки
-            Point[] points1 = new Point[3];// нос лодки
+
+            Point[] points1 = new Point[3];
            points1[0] = new Point(_startPosX + 100, _startPosY + 5);
            points1[1] = new Point(_startPosX + 100, _startPosY + 55);
            points1[2] = new Point(_startPosX + 100 + 50, _startPosY + 50 / 2);
            g.DrawPolygon(pen, points1);
            g.FillRectangle(Brushes.Black, _startPosX + 5, _startPosY + 15, 10, 10);
            g.FillRectangle(Brushes.Black, _startPosX + 5, _startPosY + 35, 10, 10);
-
-            //если есть ракетные шахты, добавить условие
            g.DrawRectangle(Pens.Black, _startPosX + 35,
               _startPosY + 23, 15, 15);
            g.DrawRectangle(Pens.Black, _startPosX + 50,
            _startPosY + 19, 30, 25);

-          /*  if (Cruiser.HelicopterPad)
-            {
-                //если есть площадка под вертолет
-                g.DrawEllipse(pen, _startPosX + 90, _startPosY + 20, 20, 20);
-            }
-            if (Cruiser.Coating)
-            {
-                //если есть спец покрытие для площадки под вертолет
-                g.FillEllipse(Brushes.Red, _startPosX + 90, _startPosY + 20, 20, 20);
-            }*/
-
        }
    }
 }
-
-
-
-
-
--- a/Cruiser/Cruiser/DrawningObjectCar.cs
+++ b/Cruiser/Cruiser/DrawningObjectCar.cs
@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Cruiser.DrawningObjects;
-using Cruiser.MovementStrategy;
-
-namespace Cruiser.MovementStrategy
-{
-    internal class DrawningObjectCar : IMoveableObject
-    {
-        private readonly DrawningCruiser? _drawningCar = null;
-        public DrawningObjectCar(DrawningCruiser drawningCar)
-        {
-            _drawningCar = drawningCar;
-        }
-        public ObjectParameters? GetObjectPosition
-        {
-            get
-            {
-                if (_drawningCar == null || _drawningCar.EntityCruiser ==
-                null)
-                {
-                    return null;
-                }
-                return new ObjectParameters(_drawningCar.GetPosX,
-                _drawningCar.GetPosY, _drawningCar.GetWidth, _drawningCar.GetHeight);
-            }
-        }
-        public int GetStep => (int)(_drawningCar?.EntityCruiser?.Step ?? 0);
-        public bool CheckCanMove(Direction direction) =>
-        _drawningCar?.CanMove(direction) ?? false;
-        public void MoveObject(Direction direction) =>
-        _drawningCar?.MoveTransport(direction);
-    }
-}
-  
--- a/Cruiser/Cruiser/DrawningObjectCruiser.cs
+++ b/Cruiser/Cruiser/DrawningObjectCruiser.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Cruiser.DrawningObjects;
+
+namespace Cruiser.MovementStrategy
+{
+    internal class DrawningObjectCruiser : IMoveableObject
+    {
+        private readonly DrawningCruiser? _drawningCruiser = null;
+        public DrawningObjectCruiser(DrawningCruiser drawningCruiser)
+        {
+            _drawningCruiser = drawningCruiser;
+        }
+        public ObjectParameters? GetObjectPosition
+        {
+            get
+            {
+                if (_drawningCruiser == null || _drawningCruiser.EntityCruiser ==
+                null)
+                {
+                    return null;
+                }
+                return new ObjectParameters(_drawningCruiser.GetPosX,
+                _drawningCruiser.GetPosY, _drawningCruiser.GetWidth, _drawningCruiser.GetHeight);
+            }
+        }
+        public int GetStep => (int)(_drawningCruiser?.EntityCruiser?.Step ?? 0);
+        public bool CheckCanMove(Direction direction) =>
+        _drawningCruiser?.CanMove(direction) ?? false;
+        public void MoveObject(Direction direction) =>
+        _drawningCruiser?.MoveTransport(direction);
+    }
+}
--- a/Cruiser/Cruiser/EntityAdvancedCruiser.cs
+++ b/Cruiser/Cruiser/EntityAdvancedCruiser.cs
@@ -4,30 +4,22 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using static System.Net.Mime.MediaTypeNames;
-
 namespace Cruiser.Entities
 {
-    public class Pro : EntityCruiser
+    public class EntityAdvancedCruiser : EntityCruiser
    {
        public Color AdditionalColor { get; private set; }
-
-
         public bool Headlights { get; private set; }
         public bool HelicopterPad { get; private set; }
-
         public bool Coating { get; private set; }
    
-    public Pro(int speed, double weight, Color bodyColor, Color
+    public EntityAdvancedCruiser(int speed, double weight, Color bodyColor, Color
   additionalColor, bool headlights, bool helicopterPad, bool coating) : base(speed, weight, bodyColor)
    {
-
        AdditionalColor = additionalColor;
        Headlights = headlights;
        HelicopterPad = helicopterPad;
        Coating = coating;
        }
+    }
 }
-
-}
-
-
--- a/Cruiser/Cruiser/EntityCruiser.cs
+++ b/Cruiser/Cruiser/EntityCruiser.cs
@@ -8,28 +8,10 @@ namespace Cruiser.Entities
 {
    public class EntityCruiser
    {
-
        public int Speed { get; private set; }
-
-
-
        public double Weight { get; private set; }
-
        public Color BodyColor { get; private set; }
-
-       // public Color AdditionalColor { get; private set; }
-
-
-       // public bool Headlights { get; private set; }
-       // public bool HelicopterPad { get; private set; }
-
-       // public bool Coating { get; private set; }
        public double Step => (double)Speed * 100 / Weight;
-
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес автомобиля</param>
-        /// <param name="bodyColor">Основной цвет</param>
-
        public EntityCruiser(int speed, double weight, Color bodyColor)
        {
            Speed = speed;
--- a/Cruiser/Cruiser/IMoveableObject.cs
+++ b/Cruiser/Cruiser/IMoveableObject.cs
@@ -3,28 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
 namespace Cruiser.MovementStrategy
-
 {
    public interface IMoveableObject
    {
        ObjectParameters? GetObjectPosition { get; }
-        /// <summary>
-        /// Шаг объекта
-        /// </summary>
        int GetStep { get; }
-        /// <summary>
-        /// Проверка, можно ли переместиться по нужному направлению
-        /// </summary>
-        /// <param name="direction"></param>
-        /// <returns></returns>
        bool CheckCanMove(Direction direction);
-        /// <summary>
-        /// Изменение направления пермещения объекта
-        /// </summary>
-        /// <param name="direction">Направление</param>
        void MoveObject(Direction direction);
    }
 }
-    
--- a/Cruiser/Cruiser/MoveToBorder.cs
+++ b/Cruiser/Cruiser/MoveToBorder.cs
@@ -29,23 +29,32 @@ namespace Cruiser.MovementStrategy
            {
                return;
            }
-            var diffX = FieldWidth - objParams.ObjectMiddleHorizontal;
+            var diffX = objParams.RightBorder - FieldWidth;
            if (Math.Abs(diffX) > GetStep())
            {
-
-                MoveRight();
-
+                if (diffX > 0)
+                {
+                    MoveLeft();
                }
-            var diffY = FieldHeight - objParams.ObjectMiddleVertical;
+                else
+                {
+                    MoveRight();
+                }
+            }
+            var diffY = objParams.DownBorder - FieldHeight;
            if (Math.Abs(diffY) > GetStep())
            {
-
+                if (diffY > 0)
+                {
+                    MoveUp();
+                }
+                else
+                {
                    MoveDown();
-
                }
            }


+        }
    }
 }
-  
--- a/Cruiser/Cruiser/MoveToCenter.cs
+++ b/Cruiser/Cruiser/MoveToCenter.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Cruiser.MovementStrategy;
+
 namespace Cruiser.MovementStrategy
 {
    internal class MoveToCenter : AbstractStrategy
@@ -55,4 +55,3 @@ namespace Cruiser.MovementStrategy
        }
    }
 }
-  
--- a/Cruiser/Cruiser/ObjectParameters.cs
+++ b/Cruiser/Cruiser/ObjectParameters.cs
@@ -12,37 +12,12 @@ namespace Cruiser.MovementStrategy
        private readonly int _y;
        private readonly int _width;
        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">Координата X</param>
-        /// <param name="y">Координата Y</param>
-        /// <param name="width">Ширина</param>
-        /// <param name="height">Высота</param>
        public ObjectParameters(int x, int y, int width, int height)
        {
            _x = x;
@@ -52,4 +27,3 @@ namespace Cruiser.MovementStrategy
        }
    }
 }
-    
--- a/Cruiser/Cruiser/Program.cs
+++ b/Cruiser/Cruiser/Program.cs
@@ -2,9 +2,6 @@ namespace Cruiser
 {
    internal static class Program
    {
-        /// <summary>
-        ///  The main entry point for the application.
-        /// </summary>
        [STAThread]
        static void Main()
        {
Author	SHA1	Message	Date
Alenka	a8db23745a	fix	2023-11-04 15:00:35 +04:00
Alenka	2dcb3f67e3	Пофиксила	2023-11-03 22:17:15 +04:00