g

ProjectBus/ProjectBus/BoatDelegate.cs

@@ -0,0 +1,10 @@
+using ProjectBoat.Drawnings;
+
+namespace ProjectBoat;
+
+/// <summary>
+/// Делегат передачи объекта класса-прорисвоки
+/// </summary>
+/// <param name="boat"></param>
+public delegate void BoatDelegate(DrawningBoat boat);
+

ProjectBus/ProjectBus/DrawningMilitaryCruiser.cs

@@ -0,0 +1,67 @@
+using System.Drawing.Drawing2D;
+using ProjectBoat.Entities;
+
+namespace ProjectBoat.Drawnings
+{
+    public class DrawningMBoat : DrawningBoat
+    {
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес</param>
+        /// <param name="bodyColor">Основной цвет</param>
+        /// <param name="additionalColor">Дополнительный цвет</param>
+        /// <param name="helicopterArea">Признак наличия вертолетной площадки</param>
+        /// <param name="boat">Признак наличия шлюпок</param>
+        /// <param name="weapon">Признак наличия пушки</param>
+
+        public DrawningMBoat(int speed, double weight, Color bodyColor, Color additionalColor, bool helicopterArea, bool boat, bool weapon)
+            : base(150, 50)
+        {
+            EntityBoat = new EntityMBoat(speed, weight, bodyColor, additionalColor, helicopterArea, boat, weapon);
+        }
+
+        public override void DrawTransport(Graphics g)
+        {
+            if (EntityBoat == null || EntityBoat is not EntityMBoat entityMBoat || !_startPosX.HasValue ||
+            !_startPosY.HasValue)
+            {
+                return;
+            }
+
+            Pen pen = new(entityMBoat.BodyColor, 2);
+            Brush additionalBrush = new SolidBrush(Color.Black);
+            Brush weaponBrush = new SolidBrush(Color.Black);
+            Brush weaponBrush2 = new SolidBrush(entityMBoat.AdditionalColor);
+            Brush helicopterAreaBrush = new HatchBrush(HatchStyle.ZigZag, entityMBoat.AdditionalColor, Color.FromArgb(163, 163, 163));
+            Brush boatBrush = new SolidBrush(entityMBoat.AdditionalColor);
+
+            base.DrawTransport(g);
+
+            if (entityMBoat.HelicopterArea)
+            {
+                g.FillEllipse(helicopterAreaBrush, _startPosX.Value + 5, _startPosY.Value + 9, 25, 30);
+                g.DrawEllipse(pen, _startPosX.Value + 5, _startPosY.Value + 9, 25, 30);
+            }
+
+            if (entityMBoat.Boat)
+            {
+                g.DrawEllipse(pen, _startPosX.Value + 34, _startPosY.Value + 2, 30, 7);
+                g.FillEllipse(boatBrush, _startPosX.Value + 34, _startPosY.Value + 2, 30, 7);
+
+                g.DrawEllipse(pen, _startPosX.Value + 34, _startPosY.Value + 39, 30, 7);
+                g.FillEllipse(boatBrush, _startPosX.Value + 34, _startPosY.Value + 39, 30, 7);
+            }
+
+            if (entityMBoat.Weapon)
+            {
+                g.DrawEllipse(pen, _startPosX.Value + 97, _startPosY.Value + 36, 10, 10);
+                g.FillEllipse(weaponBrush2, _startPosX.Value + 97, _startPosY.Value + 36, 10, 10);
+
+                g.FillRectangle(weaponBrush, _startPosX.Value + 107, _startPosY.Value + 40, 15, 5);
+            }
+
+        }
+    }
+}

ProjectBus/ProjectBus/FormBoatConfing.Designer.cs

@@ -0,0 +1,370 @@
+namespace ProjectBoat
+{
+    partial class FormBoatConfing
+    {
+        /// <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()
+        {
+            groupBoxConfing = new GroupBox();
+            groupBoxColors = new GroupBox();
+            panelPurple = new Panel();
+            panelBlack = new Panel();
+            panelGray = new Panel();
+            panelWhite = new Panel();
+            panelYellow = new Panel();
+            panelBlue = new Panel();
+            panelGreen = new Panel();
+            panelRed = new Panel();
+            checkBoxWeapon = new CheckBox();
+            checkBoxBoat = new CheckBox();
+            checkBoxHelicopterArea = new CheckBox();
+            numericUpDownWeight = new NumericUpDown();
+            labelWeight = new Label();
+            numericUpDownSpeed = new NumericUpDown();
+            labelSpeed = new Label();
+            labelModifiedObject = new Label();
+            labelSimpleObject = new Label();
+            pictureBoxObject = new PictureBox();
+            buttonAdd = new Button();
+            buttonCancel = new Button();
+            panelObject = new Panel();
+            labelAdditionalColor = new Label();
+            labelBodyColor = new Label();
+            groupBoxConfing.SuspendLayout();
+            groupBoxColors.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
+            panelObject.SuspendLayout();
+            SuspendLayout();
+            // 
+            // groupBoxConfing
+            // 
+            groupBoxConfing.Controls.Add(groupBoxColors);
+            groupBoxConfing.Controls.Add(checkBoxWeapon);
+            groupBoxConfing.Controls.Add(checkBoxBoat);
+            groupBoxConfing.Controls.Add(checkBoxHelicopterArea);
+            groupBoxConfing.Controls.Add(numericUpDownWeight);
+            groupBoxConfing.Controls.Add(labelWeight);
+            groupBoxConfing.Controls.Add(numericUpDownSpeed);
+            groupBoxConfing.Controls.Add(labelSpeed);
+            groupBoxConfing.Controls.Add(labelModifiedObject);
+            groupBoxConfing.Controls.Add(labelSimpleObject);
+            groupBoxConfing.Dock = DockStyle.Left;
+            groupBoxConfing.Location = new Point(0, 0);
+            groupBoxConfing.Name = "groupBoxConfing";
+            groupBoxConfing.Size = new Size(626, 262);
+            groupBoxConfing.TabIndex = 0;
+            groupBoxConfing.TabStop = false;
+            groupBoxConfing.Text = "Параметры";
+            // 
+            // groupBoxColors
+            // 
+            groupBoxColors.Controls.Add(panelPurple);
+            groupBoxColors.Controls.Add(panelBlack);
+            groupBoxColors.Controls.Add(panelGray);
+            groupBoxColors.Controls.Add(panelWhite);
+            groupBoxColors.Controls.Add(panelYellow);
+            groupBoxColors.Controls.Add(panelBlue);
+            groupBoxColors.Controls.Add(panelGreen);
+            groupBoxColors.Controls.Add(panelRed);
+            groupBoxColors.Location = new Point(327, 26);
+            groupBoxColors.Name = "groupBoxColors";
+            groupBoxColors.Size = new Size(280, 154);
+            groupBoxColors.TabIndex = 9;
+            groupBoxColors.TabStop = false;
+            groupBoxColors.Text = "Цвета";
+            // 
+            // panelPurple
+            // 
+            panelPurple.BackColor = Color.Purple;
+            panelPurple.Location = new Point(217, 96);
+            panelPurple.Name = "panelPurple";
+            panelPurple.Size = new Size(48, 47);
+            panelPurple.TabIndex = 1;
+            // 
+            // panelBlack
+            // 
+            panelBlack.BackColor = Color.Black;
+            panelBlack.Location = new Point(149, 96);
+            panelBlack.Name = "panelBlack";
+            panelBlack.Size = new Size(48, 47);
+            panelBlack.TabIndex = 1;
+            // 
+            // panelGray
+            // 
+            panelGray.BackColor = Color.Gray;
+            panelGray.Location = new Point(82, 96);
+            panelGray.Name = "panelGray";
+            panelGray.Size = new Size(48, 47);
+            panelGray.TabIndex = 1;
+            // 
+            // panelWhite
+            // 
+            panelWhite.BackColor = Color.White;
+            panelWhite.Location = new Point(17, 96);
+            panelWhite.Name = "panelWhite";
+            panelWhite.Size = new Size(48, 47);
+            panelWhite.TabIndex = 1;
+            // 
+            // panelYellow
+            // 
+            panelYellow.BackColor = Color.Yellow;
+            panelYellow.Location = new Point(217, 31);
+            panelYellow.Name = "panelYellow";
+            panelYellow.Size = new Size(48, 47);
+            panelYellow.TabIndex = 1;
+            // 
+            // panelBlue
+            // 
+            panelBlue.BackColor = Color.Blue;
+            panelBlue.Location = new Point(149, 31);
+            panelBlue.Name = "panelBlue";
+            panelBlue.Size = new Size(48, 47);
+            panelBlue.TabIndex = 1;
+            // 
+            // panelGreen
+            // 
+            panelGreen.BackColor = Color.Green;
+            panelGreen.Location = new Point(82, 31);
+            panelGreen.Name = "panelGreen";
+            panelGreen.Size = new Size(48, 47);
+            panelGreen.TabIndex = 1;
+            // 
+            // panelRed
+            // 
+            panelRed.BackColor = Color.Red;
+            panelRed.Location = new Point(17, 31);
+            panelRed.Name = "panelRed";
+            panelRed.Size = new Size(48, 47);
+            panelRed.TabIndex = 0;
+            // 
+            // checkBoxWeapon
+            // 
+            checkBoxWeapon.AutoSize = true;
+            checkBoxWeapon.Location = new Point(6, 217);
+            checkBoxWeapon.Name = "checkBoxWeapon";
+            checkBoxWeapon.Size = new Size(202, 24);
+            checkBoxWeapon.TabIndex = 8;
+            checkBoxWeapon.Text = "Признак наличие пушки";
+            checkBoxWeapon.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxBoat
+            // 
+            checkBoxBoat.AutoSize = true;
+            checkBoxBoat.Location = new Point(6, 169);
+            checkBoxBoat.Name = "checkBoxBoat";
+            checkBoxBoat.Size = new Size(215, 24);
+            checkBoxBoat.TabIndex = 7;
+            checkBoxBoat.Text = "Признак наличие шлюпок";
+            checkBoxBoat.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxHelicopterArea
+            // 
+            checkBoxHelicopterArea.AutoSize = true;
+            checkBoxHelicopterArea.Location = new Point(6, 123);
+            checkBoxHelicopterArea.Name = "checkBoxHelicopterArea";
+            checkBoxHelicopterArea.Size = new Size(321, 24);
+            checkBoxHelicopterArea.TabIndex = 6;
+            checkBoxHelicopterArea.Text = "Признак наличие вертолетной площадки";
+            checkBoxHelicopterArea.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            numericUpDownWeight.Location = new Point(94, 68);
+            numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+            numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+            numericUpDownWeight.Name = "numericUpDownWeight";
+            numericUpDownWeight.Size = new Size(114, 27);
+            numericUpDownWeight.TabIndex = 5;
+            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelWeight
+            // 
+            labelWeight.AutoSize = true;
+            labelWeight.Location = new Point(27, 70);
+            labelWeight.Name = "labelWeight";
+            labelWeight.Size = new Size(36, 20);
+            labelWeight.TabIndex = 4;
+            labelWeight.Text = "Вес:";
+            // 
+            // numericUpDownSpeed
+            // 
+            numericUpDownSpeed.Location = new Point(94, 32);
+            numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+            numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+            numericUpDownSpeed.Name = "numericUpDownSpeed";
+            numericUpDownSpeed.Size = new Size(114, 27);
+            numericUpDownSpeed.TabIndex = 3;
+            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelSpeed
+            // 
+            labelSpeed.AutoSize = true;
+            labelSpeed.Location = new Point(12, 32);
+            labelSpeed.Name = "labelSpeed";
+            labelSpeed.Size = new Size(76, 20);
+            labelSpeed.TabIndex = 2;
+            labelSpeed.Text = "Скорость:";
+            // 
+            // labelModifiedObject
+            // 
+            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
+            labelModifiedObject.Location = new Point(476, 203);
+            labelModifiedObject.Name = "labelModifiedObject";
+            labelModifiedObject.Size = new Size(131, 44);
+            labelModifiedObject.TabIndex = 1;
+            labelModifiedObject.Text = "Продвинутый";
+            labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelModifiedObject.MouseDown += labelObject_MouseDown;
+            // 
+            // labelSimpleObject
+            // 
+            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+            labelSimpleObject.Location = new Point(327, 203);
+            labelSimpleObject.Name = "labelSimpleObject";
+            labelSimpleObject.Size = new Size(130, 44);
+            labelSimpleObject.TabIndex = 0;
+            labelSimpleObject.Text = "Простой";
+            labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelSimpleObject.MouseDown += labelObject_MouseDown;
+            // 
+            // pictureBoxObject
+            // 
+            pictureBoxObject.Location = new Point(11, 56);
+            pictureBoxObject.Name = "pictureBoxObject";
+            pictureBoxObject.Size = new Size(183, 125);
+            pictureBoxObject.TabIndex = 1;
+            pictureBoxObject.TabStop = false;
+            // 
+            // buttonAdd
+            // 
+            buttonAdd.Location = new Point(632, 212);
+            buttonAdd.Name = "buttonAdd";
+            buttonAdd.Size = new Size(94, 29);
+            buttonAdd.TabIndex = 2;
+            buttonAdd.Text = "Добавить";
+            buttonAdd.UseVisualStyleBackColor = true;
+            buttonAdd.Click += buttonAdd_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(740, 212);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(94, 29);
+            buttonCancel.TabIndex = 3;
+            buttonCancel.Text = "Отмена";
+            buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // panelObject
+            // 
+            panelObject.AllowDrop = true;
+            panelObject.Controls.Add(labelAdditionalColor);
+            panelObject.Controls.Add(labelBodyColor);
+            panelObject.Controls.Add(pictureBoxObject);
+            panelObject.Location = new Point(632, 12);
+            panelObject.Name = "panelObject";
+            panelObject.Size = new Size(205, 194);
+            panelObject.TabIndex = 4;
+            panelObject.DragDrop += PanelObject_DragDrop;
+            panelObject.DragEnter += PanelObject_DragEnter;
+            // 
+            // labelAdditionalColor
+            // 
+            labelAdditionalColor.AllowDrop = true;
+            labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
+            labelAdditionalColor.Location = new Point(108, 11);
+            labelAdditionalColor.Name = "labelAdditionalColor";
+            labelAdditionalColor.Size = new Size(83, 36);
+            labelAdditionalColor.TabIndex = 3;
+            labelAdditionalColor.Text = "Доп. цвет";
+            labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelAdditionalColor.DragDrop += labelAdditionalColor_DragDrop;
+            labelAdditionalColor.DragEnter += labelAdditionalColor_DragEnter;
+            // 
+            // labelBodyColor
+            // 
+            labelBodyColor.AllowDrop = true;
+            labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
+            labelBodyColor.Location = new Point(11, 11);
+            labelBodyColor.Name = "labelBodyColor";
+            labelBodyColor.Size = new Size(83, 36);
+            labelBodyColor.TabIndex = 2;
+            labelBodyColor.Text = "Цвет";
+            labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelBodyColor.DragDrop += labelBodyColor_DragDrop;
+            labelBodyColor.DragEnter += labelBodyColor_DragEnter;
+            // 
+            // FormBoatConfing
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(838, 262);
+            Controls.Add(panelObject);
+            Controls.Add(buttonCancel);
+            Controls.Add(buttonAdd);
+            Controls.Add(groupBoxConfing);
+            Name = "FormBoatConfing";
+            Text = "Создание объекта";
+            groupBoxConfing.ResumeLayout(false);
+            groupBoxConfing.PerformLayout();
+            groupBoxColors.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
+            panelObject.ResumeLayout(false);
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBoxConfing;
+        private Label labelSimpleObject;
+        private Label labelModifiedObject;
+        private Label labelWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private Label labelSpeed;
+        private NumericUpDown numericUpDownWeight;
+        private CheckBox checkBoxHelicopterArea;
+        private CheckBox checkBoxBoat;
+        private CheckBox checkBoxWeapon;
+        private GroupBox groupBoxColors;
+        private Panel panelPurple;
+        private Panel panelBlack;
+        private Panel panelGray;
+        private Panel panelWhite;
+        private Panel panelYellow;
+        private Panel panelBlue;
+        private Panel panelGreen;
+        private Panel panelRed;
+        private PictureBox pictureBoxObject;
+        private Button buttonAdd;
+        private Button buttonCancel;
+        private Panel panelObject;
+        private Label labelBodyColor;
+        private Label labelAdditionalColor;
+    }
+}

ProjectBus/ProjectBus/FormBoatConfing.cs

@@ -0,0 +1,177 @@
+using ProjectBoat.Drawnings;
+using ProjectBoat.Entities;
+
+namespace ProjectBoat
+{
+    /// <summary>
+    /// Форма конфигурации объекта
+    /// </summary>
+    public partial class FormBoatConfing : Form
+    {
+        /// <summary>
+        /// Объект - прорисовка крейсера
+        /// </summary>
+        private DrawningBoat _boat;
+
+        /// <summary>
+        /// Событие для передачи объекта
+        /// </summary>
+        private event Action<DrawningBoat>? BoatDelegate;
+
+        /// <summary>
+        /// Привязка внешнего метода к событию
+        /// </summary>
+        /// <param name="carDelegate"></param>
+        public void AddEvent(Action<DrawningBoat> boatDelegate)
+        {
+            BoatDelegate += boatDelegate;
+        }
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormBoatConfing()
+        {
+            InitializeComponent();
+
+            panelRed.MouseDown += Panel_MouseDown;
+            panelGreen.MouseDown += Panel_MouseDown;
+            panelBlue.MouseDown += Panel_MouseDown;
+            panelYellow.MouseDown += Panel_MouseDown;
+            panelWhite.MouseDown += Panel_MouseDown;
+            panelGray.MouseDown += Panel_MouseDown;
+            panelBlack.MouseDown += Panel_MouseDown;
+            panelPurple.MouseDown += Panel_MouseDown;
+            //TODO  buttonCancel.Click with lambda с закрытием формы
+            buttonCancel.Click += (sender, e) => Close();
+        }
+
+        /// <summary>
+        /// Прорисовка объекта
+        /// </summary>
+        private void DrawObject()
+        {
+            Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _boat?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
+            _boat?.SetPosition(15, 15);
+            _boat?.DrawTransport(gr);
+            pictureBoxObject.Image = bmp;
+        }
+
+        /// <summary>
+        /// Передаем информацию при нажатии на Label
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void labelObject_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Label)?.DoDragDrop((sender as Label)?.Name ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+
+        /// <summary>
+        /// Проверка получаемой информации (ее типа на соответствие требуемому)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PanelObject_DragEnter(object sender, DragEventArgs e)
+        {
+            e.Effect = e.Data?.GetDataPresent(DataFormats.Text) ?? false ? DragDropEffects.Copy : DragDropEffects.None;
+
+        }
+
+        /// <summary>
+        /// Действия при приеме перетаскиваемой информации
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PanelObject_DragDrop(object sender, DragEventArgs e)
+        {
+            switch (e.Data?.GetData(DataFormats.Text)?.ToString())
+            {
+                case "labelSimpleObject":
+                    _boat = new DrawningBoat((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White);
+                    break;
+                case "labelModifiedObject":
+                    _boat = new
+                    DrawningMBoat((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White,
+                        Color.Black, checkBoxHelicopterArea.Checked, checkBoxBoat.Checked, checkBoxWeapon.Checked);
+                    break;
+            }
+            DrawObject();
+        }
+
+        /// <summary>
+        /// Передаем информацию при нажатии на Panel
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Panel_MouseDown(object sender, MouseEventArgs e)
+        {
+            //TODO отправка цвета в Drag&Drop
+            (sender as Control)?.DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+
+        // TODO Реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта)
+
+        private void labelBodyColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+
+        private void labelBodyColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_boat != null)
+            {
+                _boat.EntityBoat.setBodyColor((Color)e.Data.GetData(typeof(Color)));
+                DrawObject();
+            }
+        }
+
+        private void labelAdditionalColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (_boat is DrawningBoat)
+            {
+                if (e.Data.GetDataPresent(typeof(Color)))
+                {
+                    e.Effect = DragDropEffects.Copy;
+                }
+                else
+                {
+                    e.Effect = DragDropEffects.None;
+                }
+            }
+        }
+
+        private void labelAdditionalColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_boat.EntityBoat is EntityMBoat militaryBoat)
+            {
+                militaryBoat.setAdditionalColor((Color)e.Data.GetData(typeof(Color)));
+            }
+            DrawObject();
+        }
+
+        /// <summary>
+        /// Передача объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonAdd_Click(object sender, EventArgs e)
+        {
+            if (_boat != null)
+            {
+                BoatDelegate?.Invoke(_boat);
+                Close();
+            }
+
+        }
+    }
+}

ProjectBus/ProjectBus/FormBoatConfing.resx

@@ -0,0 +1,120 @@
+<?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>
+</root>

ProjectBus/ProjectBus/FormBoatsCollection.Designer.cs

@@ -41,7 +41,6 @@
             comboBoxSelectorCompany = new ComboBox();
             panelCompanyTools = new Panel();
             ButtonAddBoat = new Button();
-            ButtonAddMBoat = new Button();
             buttonRefresh = new Button();
             ButtonRemoveBoat = new Button();
             maskedTextBoxPosision = new MaskedTextBox();
@@ -60,21 +59,18 @@
             groupBoxTools.Controls.Add(comboBoxSelectorCompany);
             groupBoxTools.Controls.Add(panelCompanyTools);
             groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(510, 0);
-            groupBoxTools.Margin = new Padding(3, 2, 3, 2);
+            groupBoxTools.Location = new Point(583, 0);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Padding = new Padding(3, 2, 3, 2);
-            groupBoxTools.Size = new Size(194, 490);
+            groupBoxTools.Size = new Size(222, 653);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "инструменты";
             // 
             // buttonCreateCompany
             // 
-            buttonCreateCompany.Location = new Point(18, 259);
-            buttonCreateCompany.Margin = new Padding(3, 2, 3, 2);
+            buttonCreateCompany.Location = new Point(21, 345);
             buttonCreateCompany.Name = "buttonCreateCompany";
-            buttonCreateCompany.Size = new Size(163, 20);
+            buttonCreateCompany.Size = new Size(186, 27);
             buttonCreateCompany.TabIndex = 7;
             buttonCreateCompany.Text = "Создать компанию";
             buttonCreateCompany.UseVisualStyleBackColor = true;
@@ -90,18 +86,16 @@
             panelStorage.Controls.Add(textBoxCollectionName);
             panelStorage.Controls.Add(labelCollectionName);
             panelStorage.Dock = DockStyle.Top;
-            panelStorage.Location = new Point(3, 18);
-            panelStorage.Margin = new Padding(3, 2, 3, 2);
+            panelStorage.Location = new Point(3, 23);
             panelStorage.Name = "panelStorage";
-            panelStorage.Size = new Size(188, 212);
+            panelStorage.Size = new Size(216, 283);
             panelStorage.TabIndex = 6;
             // 
             // buttonCollectionDel
             // 
-            buttonCollectionDel.Location = new Point(15, 185);
-            buttonCollectionDel.Margin = new Padding(3, 2, 3, 2);
+            buttonCollectionDel.Location = new Point(17, 247);
             buttonCollectionDel.Name = "buttonCollectionDel";
-            buttonCollectionDel.Size = new Size(163, 20);
+            buttonCollectionDel.Size = new Size(186, 27);
             buttonCollectionDel.TabIndex = 6;
             buttonCollectionDel.Text = "Удалить коллекцию";
             buttonCollectionDel.UseVisualStyleBackColor = true;
@@ -110,19 +104,17 @@
             // listBoxCollection
             // 
             listBoxCollection.FormattingEnabled = true;
-            listBoxCollection.ItemHeight = 15;
-            listBoxCollection.Location = new Point(15, 103);
-            listBoxCollection.Margin = new Padding(3, 2, 3, 2);
+            listBoxCollection.ItemHeight = 20;
+            listBoxCollection.Location = new Point(17, 137);
             listBoxCollection.Name = "listBoxCollection";
-            listBoxCollection.Size = new Size(163, 79);
+            listBoxCollection.Size = new Size(186, 104);
             listBoxCollection.TabIndex = 5;
             // 
             // buttonCollecctionAdd
             // 
-            buttonCollecctionAdd.Location = new Point(15, 78);
-            buttonCollecctionAdd.Margin = new Padding(3, 2, 3, 2);
+            buttonCollecctionAdd.Location = new Point(17, 104);
             buttonCollecctionAdd.Name = "buttonCollecctionAdd";
-            buttonCollecctionAdd.Size = new Size(163, 20);
+            buttonCollecctionAdd.Size = new Size(186, 27);
             buttonCollecctionAdd.TabIndex = 4;
             buttonCollecctionAdd.Text = "Добавить коллекцию";
             buttonCollecctionAdd.UseVisualStyleBackColor = true;
@@ -131,10 +123,9 @@
             // radioButtonList
             // 
             radioButtonList.AutoSize = true;
-            radioButtonList.Location = new Point(108, 56);
-            radioButtonList.Margin = new Padding(3, 2, 3, 2);
+            radioButtonList.Location = new Point(123, 75);
             radioButtonList.Name = "radioButtonList";
-            radioButtonList.Size = new Size(66, 19);
+            radioButtonList.Size = new Size(80, 24);
             radioButtonList.TabIndex = 3;
             radioButtonList.TabStop = true;
             radioButtonList.Text = "Список";
@@ -143,10 +134,9 @@
             // radioButtonMassive
             // 
             radioButtonMassive.AutoSize = true;
-            radioButtonMassive.Location = new Point(15, 56);
-            radioButtonMassive.Margin = new Padding(3, 2, 3, 2);
+            radioButtonMassive.Location = new Point(17, 75);
             radioButtonMassive.Name = "radioButtonMassive";
-            radioButtonMassive.Size = new Size(67, 19);
+            radioButtonMassive.Size = new Size(82, 24);
             radioButtonMassive.TabIndex = 2;
             radioButtonMassive.TabStop = true;
             radioButtonMassive.Text = "Массив";
@@ -154,18 +144,17 @@
             // 
             // textBoxCollectionName
             // 
-            textBoxCollectionName.Location = new Point(15, 24);
-            textBoxCollectionName.Margin = new Padding(3, 2, 3, 2);
+            textBoxCollectionName.Location = new Point(17, 32);
             textBoxCollectionName.Name = "textBoxCollectionName";
-            textBoxCollectionName.Size = new Size(163, 23);
+            textBoxCollectionName.Size = new Size(186, 27);
             textBoxCollectionName.TabIndex = 1;
             // 
             // labelCollectionName
             // 
             labelCollectionName.AutoSize = true;
-            labelCollectionName.Location = new Point(23, 7);
+            labelCollectionName.Location = new Point(26, 9);
             labelCollectionName.Name = "labelCollectionName";
-            labelCollectionName.Size = new Size(122, 15);
+            labelCollectionName.Size = new Size(155, 20);
             labelCollectionName.TabIndex = 0;
             labelCollectionName.Text = "Название коллекции";
             // 
@@ -174,60 +163,43 @@
             comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxSelectorCompany.FormattingEnabled = true;
             comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(18, 233);
-            comboBoxSelectorCompany.Margin = new Padding(3, 2, 3, 2);
+            comboBoxSelectorCompany.Location = new Point(21, 311);
             comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
-            comboBoxSelectorCompany.Size = new Size(163, 23);
+            comboBoxSelectorCompany.Size = new Size(186, 28);
             comboBoxSelectorCompany.TabIndex = 0;
             comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged_1;
             // 
             // panelCompanyTools
             // 
             panelCompanyTools.Controls.Add(ButtonAddBoat);
-            panelCompanyTools.Controls.Add(ButtonAddMBoat);
             panelCompanyTools.Controls.Add(buttonRefresh);
             panelCompanyTools.Controls.Add(ButtonRemoveBoat);
             panelCompanyTools.Controls.Add(maskedTextBoxPosision);
             panelCompanyTools.Controls.Add(buttonGetToTest);
             panelCompanyTools.Enabled = false;
-            panelCompanyTools.Location = new Point(3, 284);
-            panelCompanyTools.Margin = new Padding(3, 2, 3, 2);
+            panelCompanyTools.Location = new Point(3, 379);
             panelCompanyTools.Name = "panelCompanyTools";
-            panelCompanyTools.Size = new Size(189, 206);
+            panelCompanyTools.Size = new Size(216, 274);
             panelCompanyTools.TabIndex = 8;
             // 
             // ButtonAddBoat
             // 
             ButtonAddBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
             ButtonAddBoat.BackgroundImageLayout = ImageLayout.Center;
-            ButtonAddBoat.Location = new Point(16, 2);
-            ButtonAddBoat.Margin = new Padding(3, 2, 3, 2);
+            ButtonAddBoat.Location = new Point(18, 3);
             ButtonAddBoat.Name = "ButtonAddBoat";
-            ButtonAddBoat.Size = new Size(163, 30);
+            ButtonAddBoat.Size = new Size(186, 40);
             ButtonAddBoat.TabIndex = 1;
-            ButtonAddBoat.Text = "добваление лодки";
+            ButtonAddBoat.Text = "добваление крейсера";
             ButtonAddBoat.UseVisualStyleBackColor = true;
             ButtonAddBoat.Click += ButtonAddBoat_Click;
             // 
-            // ButtonAddMBoat
-            // 
-            ButtonAddMBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            ButtonAddMBoat.Location = new Point(16, 37);
-            ButtonAddMBoat.Margin = new Padding(3, 2, 3, 2);
-            ButtonAddMBoat.Name = "ButtonAddMBoat";
-            ButtonAddMBoat.Size = new Size(163, 38);
-            ButtonAddMBoat.TabIndex = 2;
-            ButtonAddMBoat.Text = "добваление моторной лодки";
-            ButtonAddMBoat.UseVisualStyleBackColor = true;
-            ButtonAddMBoat.Click += ButtonAddMBoat_Click;
-            // 
             // buttonRefresh
             // 
             buttonRefresh.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(16, 170);
-            buttonRefresh.Margin = new Padding(3, 2, 3, 2);
+            buttonRefresh.Location = new Point(18, 227);
             buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(163, 31);
+            buttonRefresh.Size = new Size(186, 41);
             buttonRefresh.TabIndex = 5;
             buttonRefresh.Text = "обновить";
             buttonRefresh.UseVisualStyleBackColor = true;
@@ -236,32 +208,29 @@
             // ButtonRemoveBoat
             // 
             ButtonRemoveBoat.Anchor = AnchorStyles.Right;
-            ButtonRemoveBoat.Location = new Point(16, 104);
-            ButtonRemoveBoat.Margin = new Padding(3, 2, 3, 2);
+            ButtonRemoveBoat.Location = new Point(18, 138);
             ButtonRemoveBoat.Name = "ButtonRemoveBoat";
-            ButtonRemoveBoat.Size = new Size(163, 30);
+            ButtonRemoveBoat.Size = new Size(186, 40);
             ButtonRemoveBoat.TabIndex = 3;
-            ButtonRemoveBoat.Text = "удалить лодку";
+            ButtonRemoveBoat.Text = "удалить крейсер";
             ButtonRemoveBoat.UseVisualStyleBackColor = true;
             ButtonRemoveBoat.Click += ButtonRemoveBoat_Click;
             // 
             // maskedTextBoxPosision
             // 
-            maskedTextBoxPosision.Location = new Point(15, 79);
-            maskedTextBoxPosision.Margin = new Padding(3, 2, 3, 2);
+            maskedTextBoxPosision.Location = new Point(17, 105);
             maskedTextBoxPosision.Mask = "00";
             maskedTextBoxPosision.Name = "maskedTextBoxPosision";
-            maskedTextBoxPosision.Size = new Size(164, 23);
+            maskedTextBoxPosision.Size = new Size(187, 27);
             maskedTextBoxPosision.TabIndex = 2;
             maskedTextBoxPosision.ValidatingType = typeof(int);
             // 
             // buttonGetToTest
             // 
             buttonGetToTest.Anchor = AnchorStyles.Right;
-            buttonGetToTest.Location = new Point(16, 138);
-            buttonGetToTest.Margin = new Padding(3, 2, 3, 2);
+            buttonGetToTest.Location = new Point(18, 184);
             buttonGetToTest.Name = "buttonGetToTest";
-            buttonGetToTest.Size = new Size(163, 30);
+            buttonGetToTest.Size = new Size(186, 40);
             buttonGetToTest.TabIndex = 4;
             buttonGetToTest.Text = "передать на тесты";
             buttonGetToTest.UseVisualStyleBackColor = true;
@@ -271,20 +240,18 @@
             // 
             pictureBoxBoat.Dock = DockStyle.Fill;
             pictureBoxBoat.Location = new Point(0, 0);
-            pictureBoxBoat.Margin = new Padding(3, 2, 3, 2);
             pictureBoxBoat.Name = "pictureBoxBoat";
-            pictureBoxBoat.Size = new Size(510, 490);
+            pictureBoxBoat.Size = new Size(583, 653);
             pictureBoxBoat.TabIndex = 1;
             pictureBoxBoat.TabStop = false;
             // 
             // FormBoatsCollection
             // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(704, 490);
+            ClientSize = new Size(805, 653);
             Controls.Add(pictureBoxBoat);
             Controls.Add(groupBoxTools);
-            Margin = new Padding(3, 2, 3, 2);
             Name = "FormBoatsCollection";
             Text = "FormBoatsCollection";
             groupBoxTools.ResumeLayout(false);
@@ -300,7 +267,6 @@
 
         private GroupBox groupBoxTools;
         private ComboBox comboBoxSelectorCompany;
-        private Button ButtonAddMBoat;
         private Button ButtonAddBoat;
         private Button ButtonRemoveBoat;
         private Button buttonRefresh;

ProjectBus/ProjectBus/FormBoatsCollection.cs

@@ -1,5 +1,6 @@
 using ProjectBoat.CollectionGenericObjects;
 using ProjectBoat.Drawnings;
+using System.Windows.Forms;
 
 namespace ProjectBoat
 {
@@ -34,33 +35,27 @@ namespace ProjectBoat
             panelCompanyTools.Enabled = false;
         }
 
+        private void ButtonAddBoat_Click(object sender, EventArgs e)
+        {
+            FormBoatConfing form = new();
+            // TODO передать метод
+
+            form.Show();
+            form.AddEvent(SetBoat);
+        }
+
         /// <summary>
-        /// Создание объекта класса-перемещения
+        /// Добавление крейсера в коллекцию
         /// </summary>
-        /// <param name="type">Тип создаваемого объекта</param>
-        private void CreateObject(string type)
+        /// <param name="boat"></param>
+        private void SetBoat(DrawningBoat boat)
         {
-            if (_company == null)
+            if (_company == null || boat == null)
             {
                 return;
             }
-            Random random = new();
-            DrawningBoat drawningBoat;
-            switch (type)
-            {
-                case nameof(DrawningBoat):
-                    drawningBoat = new DrawningBoat(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
-                    break;
-                case nameof(DrawningMBoat):
-                    // TODO вызов диалогового окна для выбора цвета
-                    drawningBoat = new DrawningMBoat(random.Next(100, 300), random.Next(1000, 3000),
-                    GetColor(random), GetColor(random),
-                    Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
-                    break;
-                default:
-                    return;
-            }
-            if (_company + drawningBoat != -1)
+
+            if (_company + boat != -1)
             {
                 MessageBox.Show("Объект добавлен");
                 pictureBoxBoat.Image = _company.Show();
@@ -72,35 +67,10 @@ namespace ProjectBoat
         }
 
         /// <summary>
-        /// Получение цвета
+        /// Удаление объекта
         /// </summary>
-        /// <param name="random">Генератор случайных чисел</param>
-        /// <returns></returns>
-        private static Color GetColor(Random random)
-        {
-            Color color = Color.FromArgb(random.Next(0, 256), random.Next(0,
-            256), random.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            return color;
-        }
-
-        //private void ButtonAddBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBoat));
-
-        //private void ButtonAddMBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningMBoat));
-        private void ButtonAddBoat_Click(object sender, EventArgs e)
-        {
-            CreateObject(nameof(DrawningBoat));
-        }
-
-        private void ButtonAddMBoat_Click(object sender, EventArgs e)
-        {
-            CreateObject(nameof(DrawningMBoat));
-        }
-
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void ButtonRemoveBoat_Click(object sender, EventArgs e)
         {
             if (string.IsNullOrEmpty(maskedTextBoxPosision.Text) || _company == null)
@@ -131,24 +101,24 @@ namespace ProjectBoat
                 return;
             }
 
-            DrawningBoat? cruiser = null;
+            DrawningBoat? boat = null;
             int counter = 100;
-            while (cruiser == null)
+            while (boat == null)
             {
-                cruiser = _company.GetRandomObject();
+                boat = _company.GetRandomObject();
                 counter--;
                 if (counter <= 0)
                 {
                     break;
                 }
             }
-            if (cruiser == null)
+            if (boat == null)
             {
                 return;
             }
             FormBoat form = new()
             {
-                SetBoat = cruiser
+                SetBoat = boat
             };
             form.ShowDialog();
 

ProjectBus/ProjectBus/MovementStrategy/MoveableBoat.cs

@@ -10,36 +10,36 @@ namespace ProjectBoat.MovementStrategy
         /// <summary>
         /// Поле-объект класса DrawningBoat или его наследника
         /// </summary>
-        private readonly DrawningBoat? _cruiser = null;
+        private readonly DrawningBoat? _boat = null;
         /// <summary>
         /// Конструктор
         /// </summary>
-        /// <param name="cruiser">Объект класса DrawningBoat</param>
-        public MoveableBoat(DrawningBoat cruiser)
+        /// <param name="boat">Объект класса DrawningBoat</param>
+        public MoveableBoat(DrawningBoat boat)
         {
-            _cruiser = cruiser;
+            _boat = boat;
         }
         public ObjectParameters? GetObjectPosition
         {
             get
             {
-                if (_cruiser == null || _cruiser.EntityBoat == null ||
-                !_cruiser.GetPosX.HasValue || !_cruiser.GetPosY.HasValue)
+                if (_boat == null || _boat.EntityBoat == null ||
+                !_boat.GetPosX.HasValue || !_boat.GetPosY.HasValue)
                 {
                     return null;
                 }
-                return new ObjectParameters(_cruiser.GetPosX.Value,
-                _cruiser.GetPosY.Value, _cruiser.GetWidth, _cruiser.GetHeight);
+                return new ObjectParameters(_boat.GetPosX.Value,
+                _boat.GetPosY.Value, _boat.GetWidth, _boat.GetHeight);
             }
         }
-        public int GetStep => (int)(_cruiser?.EntityBoat?.Step ?? 0);
+        public int GetStep => (int)(_boat?.EntityBoat?.Step ?? 0);
         public bool TryMoveObject(MovementDirection direction)
         {
-            if (_cruiser == null || _cruiser.EntityBoat == null)
+            if (_boat == null || _boat.EntityBoat == null)
             {
                 return false;
             }
-            return _cruiser.MoveTransport(GetDirectionType(direction));
+            return _boat.MoveTransport(GetDirectionType(direction));
         }
         /// <summary>
         /// Конвертация из MovementDirection в DirectionType