ProjectBattleship/ProjectBattleship/AbstractStrategy.cs

@@ -1,59 +0,0 @@
-using ProjectBattleship.MovementStrateg;
-
-namespace ProjectBattleship.MovementStrategy;
-public abstract class AbstractStrategy
-{
-    private IMoveableObject? _moveableObject;
-    private StrategyStatus _state = StrategyStatus.NotInit;
-    protected int FieldWidth { get; private set; }
-    protected int FieldHeight { get; private set; }
-    public StrategyStatus GetStatus() { return _state; }
-    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;
-    }
-    public void MakeStep()
-    {
-        if (_state != StrategyStatus.InProgress)
-        {
-            return;
-        }
-        if (IsTargetDestinaion())
-        {
-            _state = StrategyStatus.Finish;
-            return;
-        }
-        MoveToTarget();
-    }
-    protected bool MoveLeft() => MoveTo(MovementDirection.Left);
-    protected bool MoveRight() => MoveTo(MovementDirection.Right);
-    protected bool MoveUp() => MoveTo(MovementDirection.Up);
-    protected bool MoveDown() => MoveTo(MovementDirection.Down);
-    protected ObjectParameters? GetObjectParameters => _moveableObject?.GetObjectPosition;
-    protected int? GetStep()
-    {
-        if (_state != StrategyStatus.InProgress)
-        {
-            return null;
-        }
-        return _moveableObject?.GetStep;
-    }
-    protected abstract void MoveToTarget();
-    protected abstract bool IsTargetDestinaion();
-    private bool MoveTo(MovementDirection movementDirection)
-    {
-        if (_state != StrategyStatus.InProgress)
-        {
-            return false;
-        }
-        return _moveableObject?.TryMoveObject(movementDirection) ?? false;
-    }
-}

ProjectBattleship/ProjectBattleship/DirectionType.cs

@@ -1,11 +0,0 @@
-namespace ProjectBattleship
-{
-    public enum DirectionType
-    {
-        Unknow = -1,
-        Up = 1,
-        Down = 2,
-        Left = 3,
-        Right = 4
-    }
-}

ProjectBattleship/ProjectBattleship/DrawingBattleship.cs

@@ -1,42 +0,0 @@
-using ProjectBattleship.Entities;
-
-namespace ProjectBattleship.Drawning;
-public class DrawingBattleship : DrawingShip
-{
-    public DrawingBattleship(int speed, double weight, Color bodyColor, Color additionalColor, bool turret, bool rocketLauncher) : base(150, 50)
-    {
-        EntityShip = new EntityBattleship(speed, weight, bodyColor, additionalColor, turret, rocketLauncher);
-    }
-    public override void DrawTransport(Graphics g)
-    {
-        if (EntityShip == null || EntityShip is not EntityBattleship battleship || !_startPosX.HasValue || !_startPosY.HasValue)
-        {
-            return;
-        }
-        Pen pen = new(Color.Black);
-        Brush additionalBrush = new SolidBrush(battleship.AdditionalColor);
-        base.DrawTransport(g);
-        //орудийная башня
-        if (battleship.Turret)
-        {
-            Point[] shield = new Point[] {new Point(_startPosX.Value + 112, _startPosY.Value + 19), new Point(_startPosX.Value + 112, _startPosY.Value + 31),
-                new Point(_startPosX.Value + 119, _startPosY.Value + 28), new Point(_startPosX.Value + 119, _startPosY.Value + 22)};
-            g.FillPolygon(additionalBrush, shield);
-            g.FillRectangle(additionalBrush, _startPosX.Value + 119, _startPosY.Value + 24, 12, 2);
-            g.DrawPolygon(pen, shield);
-            g.DrawRectangle(pen, _startPosX.Value + 119, _startPosY.Value + 24, 12, 2);
-        }
-        //ячейки для ракет
-        if (battleship.RocketLauncher)
-        {
-            g.FillRectangle(additionalBrush, _startPosX.Value + 14, _startPosY.Value + 14, 10, 10);
-            g.FillRectangle(additionalBrush, _startPosX.Value + 26, _startPosY.Value + 14, 10, 10);
-            g.FillRectangle(additionalBrush, _startPosX.Value + 14, _startPosY.Value + 26, 10, 10);
-            g.FillRectangle(additionalBrush, _startPosX.Value + 26, _startPosY.Value + 26, 10, 10);
-            g.DrawRectangle(pen, _startPosX.Value + 14, _startPosY.Value + 14, 10, 10);
-            g.DrawRectangle(pen, _startPosX.Value + 26, _startPosY.Value + 14, 10, 10);
-            g.DrawRectangle(pen, _startPosX.Value + 14, _startPosY.Value + 26, 10, 10);
-            g.DrawRectangle(pen, _startPosX.Value + 26, _startPosY.Value + 26, 10, 10);
-        }
-    }
-}

ProjectBattleship/ProjectBattleship/DrawingShip.cs

@@ -1,144 +0,0 @@
-using ProjectBattleship.Entities;
-
-namespace ProjectBattleship.Drawning;
-public class DrawingShip
-{
-    public EntityShip? EntityShip { get; protected set; }
-    private int? _pictureWidth;
-    private int? _pictureHeight;
-    protected int? _startPosX;
-    protected int? _startPosY;
-    private readonly int _shipWidth = 150;
-    private readonly int _shipHeight = 50;
-    public int? GetPosX => _startPosX;
-    public int? GetPosY => _startPosY;
-    public int GetWidth => _shipWidth;
-    public int GetHeight => _shipHeight;
-    private DrawingShip()
-    {
-        _pictureWidth = null;
-        _pictureHeight = null;
-        _startPosX = null;
-        _startPosY = null;
-    }
-    public DrawingShip(int speed, double weight, Color bodycolor) : this()
-    {
-        EntityShip = new EntityShip(speed, weight, bodycolor);
-        _pictureWidth = null;
-        _pictureHeight = null;
-        _startPosX = null;
-        _startPosY = null;
-    }
-    protected DrawingShip(int shipWidth, int shipHeight) : this()
-    {
-        _shipWidth = shipWidth;
-        _shipHeight = shipHeight;
-    }
-    public bool SetPictureSize(int width, int height)
-    {
-        if (width >= _shipWidth || height >= _shipHeight)
-        {
-            _pictureWidth = width;
-            _pictureHeight = height;
-            if (_startPosX != null && _startPosY != null)
-            {
-                SetPosition(_startPosX.Value, _startPosY.Value);
-            }
-            return true;
-        }
-        return false;
-    }
-    public void SetPosition(int x, int y)
-    {
-        if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
-        {
-            return;
-        }
-        if (x < 0)
-        {
-            x = 0;
-        }
-        else if (x > _pictureWidth - _shipWidth)
-        {
-            x = _pictureWidth.Value - _shipWidth;
-        }
-        if (y < 0)
-        {
-            y = 0;
-        }
-        else if (y > _pictureHeight - _shipHeight)
-        {
-            y = _pictureHeight.Value - _shipHeight;
-        }
-        _startPosX = x;
-        _startPosY = y;
-    }
-    public bool MoveTransport(DirectionType direction)
-    {
-        if (EntityShip == null || !_startPosX.HasValue || !_startPosY.HasValue)
-        {
-            return false;
-        }
-        switch (direction)
-        {
-            // Влево
-            case DirectionType.Left:
-                if (_startPosX.Value - EntityShip.Step > 0)
-                {
-                    _startPosX -= (int)EntityShip.Step;
-                }
-                return true;
-            //Вверх
-            case DirectionType.Up:
-                if (_startPosY.Value - EntityShip.Step > 0)
-                {
-                    _startPosY -= (int)EntityShip.Step;
-                }
-                return true;
-            //Вправо
-            case DirectionType.Right:
-                {
-                    if (_startPosX.Value + _shipWidth + EntityShip.Step < _pictureWidth)
-                    {
-                        _startPosX += (int)EntityShip.Step;
-                    }
-                }
-                return true;
-            //Вниз
-            case DirectionType.Down:
-                {
-                    if (_startPosY.Value + _shipHeight + EntityShip.Step < _pictureHeight)
-                    {
-                        _startPosY += (int)EntityShip.Step;
-                    }
-                }
-                return true;
-            default:
-                return false;
-        }
-    }
-    public virtual void DrawTransport(Graphics g)
-    {
-        if (EntityShip == null || !_startPosX.HasValue || !_startPosY.HasValue)
-        {
-            return;
-        }
-        Pen pen = new(Color.Black);
-        Brush bodyBrush = new SolidBrush(EntityShip.BodyColor);
-        //корпус
-        Point[] hull = new Point[] {new Point(_startPosX.Value + 5, _startPosY.Value), new Point(_startPosX.Value + 100, _startPosY.Value),
-            new Point(_startPosX.Value + 150, _startPosY.Value + 25), new Point(_startPosX.Value + 100, _startPosY.Value + 50), new Point(_startPosX.Value + 5, _startPosY.Value + 50)};
-        g.FillPolygon(bodyBrush, hull);
-        g.DrawPolygon(pen, hull);
-        Brush brBlack = new SolidBrush(Color.Black);
-        g.FillRectangle(brBlack, _startPosX.Value, _startPosY.Value + 6, 5, 13);
-        g.FillRectangle(brBlack, _startPosX.Value, _startPosY.Value + 31, 5, 13);
-        //надстройки
-        Brush brDark = new SolidBrush(Color.DarkGray);
-        g.FillRectangle(brDark, _startPosX.Value + 39, _startPosY.Value + 20, 40, 10);
-        g.DrawRectangle(pen, _startPosX.Value + 39, _startPosY.Value + 20, 40, 10);
-        g.FillRectangle(brDark, _startPosX.Value + 70, _startPosY.Value + 12, 18, 26);
-        g.DrawRectangle(pen, _startPosX.Value + 70, _startPosY.Value + 12, 18, 26);
-        g.FillEllipse(brBlack, _startPosX.Value + 94, _startPosY.Value + 19, 12, 12);
-    }
-}

ProjectBattleship/ProjectBattleship/EntityBattleship.cs

@@ -1,14 +0,0 @@
-namespace ProjectBattleship.Entities;
-public class EntityBattleship : EntityShip
-{
-    public Color AdditionalColor { get; private set; }
-    public bool Turret { get; private set; }
-    public bool RocketLauncher { get; private set; }
-    public double Step => (double)Speed * 100 / Weight;
-    public EntityBattleship(int speed, double weight, Color bodyColor, Color additionalColor, bool turret, bool rocketLauncher) : base(speed, weight, bodyColor)
-    {
-        AdditionalColor = additionalColor;
-        Turret = turret;
-        RocketLauncher = rocketLauncher;
-    }
-}

ProjectBattleship/ProjectBattleship/EntityShip.cs

@@ -1,14 +0,0 @@
-namespace ProjectBattleship.Entities;
-public class EntityShip
-{
-    public int Speed { get; private set; }
-    public double Weight { get; private set; }
-    public Color BodyColor { get; private set; }
-    public double Step => Speed * 100 / Weight;
-    public EntityShip(int speed, double weight, Color bodyColor)
-    {
-        Speed = speed;
-        Weight = weight;
-        BodyColor = bodyColor;
-    }
-}

ProjectBattleship/ProjectBattleship/Form1.Designer.cs

@@ -0,0 +1,39 @@
+namespace ProjectBattleship
+{
+    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()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Text = "Form1";
+        }
+
+        #endregion
+    }
+}

ProjectBattleship/ProjectBattleship/Form1.cs

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

ProjectBattleship/ProjectBattleship/FormBattleship.Designer.cs

@@ -1,178 +0,0 @@
-namespace ProjectBattleship
-{
-    partial class FormBattleship
-    {
-        /// <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()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormBattleship));
-            pictureBoxBattleship = new PictureBox();
-            buttonCreate = new Button();
-            buttonLeft = new Button();
-            buttonUp = new Button();
-            buttonDown = new Button();
-            buttonRight = new Button();
-            buttonCreateShip = new Button();
-            comboBoxStrategy = new ComboBox();
-            buttonStrategyStep = new Button();
-            ((System.ComponentModel.ISupportInitialize)pictureBoxBattleship).BeginInit();
-            SuspendLayout();
-            // 
-            // pictureBoxBattleship
-            // 
-            pictureBoxBattleship.Dock = DockStyle.Fill;
-            pictureBoxBattleship.Location = new Point(0, 0);
-            pictureBoxBattleship.Margin = new Padding(3, 4, 3, 4);
-            pictureBoxBattleship.Name = "pictureBoxBattleship";
-            pictureBoxBattleship.Size = new Size(922, 598);
-            pictureBoxBattleship.SizeMode = PictureBoxSizeMode.AutoSize;
-            pictureBoxBattleship.TabIndex = 0;
-            pictureBoxBattleship.TabStop = false;
-            // 
-            // buttonCreate
-            // 
-            buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreate.Location = new Point(38, 500);
-            buttonCreate.Name = "buttonCreate";
-            buttonCreate.Size = new Size(121, 62);
-            buttonCreate.TabIndex = 1;
-            buttonCreate.Text = "Создать линкор";
-            buttonCreate.UseVisualStyleBackColor = true;
-            buttonCreate.Click += buttonCreate_Click;
-            // 
-            // buttonLeft
-            // 
-            buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonLeft.BackgroundImage = (Image)resources.GetObject("buttonLeft.BackgroundImage");
-            buttonLeft.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonLeft.Location = new Point(734, 525);
-            buttonLeft.Name = "buttonLeft";
-            buttonLeft.Size = new Size(39, 37);
-            buttonLeft.TabIndex = 2;
-            buttonLeft.UseVisualStyleBackColor = true;
-            buttonLeft.Click += ButtonMove_Click;
-            // 
-            // buttonUp
-            // 
-            buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonUp.BackgroundImage = (Image)resources.GetObject("buttonUp.BackgroundImage");
-            buttonUp.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonUp.Location = new Point(794, 471);
-            buttonUp.Name = "buttonUp";
-            buttonUp.Size = new Size(39, 37);
-            buttonUp.TabIndex = 3;
-            buttonUp.UseVisualStyleBackColor = true;
-            buttonUp.Click += ButtonMove_Click;
-            // 
-            // buttonDown
-            // 
-            buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonDown.BackgroundImage = (Image)resources.GetObject("buttonDown.BackgroundImage");
-            buttonDown.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonDown.Location = new Point(794, 525);
-            buttonDown.Name = "buttonDown";
-            buttonDown.Size = new Size(39, 37);
-            buttonDown.TabIndex = 4;
-            buttonDown.UseVisualStyleBackColor = true;
-            buttonDown.Click += ButtonMove_Click;
-            // 
-            // buttonRight
-            // 
-            buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonRight.BackgroundImage = (Image)resources.GetObject("buttonRight.BackgroundImage");
-            buttonRight.BackgroundImageLayout = ImageLayout.Zoom;
-            buttonRight.Location = new Point(854, 525);
-            buttonRight.Name = "buttonRight";
-            buttonRight.Size = new Size(39, 37);
-            buttonRight.TabIndex = 5;
-            buttonRight.UseVisualStyleBackColor = true;
-            buttonRight.Click += ButtonMove_Click;
-            // 
-            // buttonCreateShip
-            // 
-            buttonCreateShip.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateShip.Location = new Point(212, 500);
-            buttonCreateShip.Name = "buttonCreateShip";
-            buttonCreateShip.Size = new Size(121, 62);
-            buttonCreateShip.TabIndex = 6;
-            buttonCreateShip.Text = "Создать корабль";
-            buttonCreateShip.UseVisualStyleBackColor = true;
-            buttonCreateShip.Click += buttonCreateShip_Click;
-            // 
-            // comboBoxStrategy
-            // 
-            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
-            comboBoxStrategy.FormattingEnabled = true;
-            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
-            comboBoxStrategy.Location = new Point(742, 24);
-            comboBoxStrategy.Name = "comboBoxStrategy";
-            comboBoxStrategy.Size = new Size(151, 28);
-            comboBoxStrategy.TabIndex = 8;
-            // 
-            // buttonStrategyStep
-            // 
-            buttonStrategyStep.Location = new Point(799, 74);
-            buttonStrategyStep.Name = "buttonStrategyStep";
-            buttonStrategyStep.Size = new Size(94, 29);
-            buttonStrategyStep.TabIndex = 10;
-            buttonStrategyStep.Text = "Шаг";
-            buttonStrategyStep.UseVisualStyleBackColor = true;
-            buttonStrategyStep.Click += buttonStrategyStep_Click;
-            // 
-            // FormBattleship
-            // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(922, 598);
-            Controls.Add(buttonStrategyStep);
-            Controls.Add(comboBoxStrategy);
-            Controls.Add(buttonCreateShip);
-            Controls.Add(buttonRight);
-            Controls.Add(buttonDown);
-            Controls.Add(buttonUp);
-            Controls.Add(buttonLeft);
-            Controls.Add(buttonCreate);
-            Controls.Add(pictureBoxBattleship);
-            Name = "FormBattleship";
-            Text = "Линкор";
-            ((System.ComponentModel.ISupportInitialize)pictureBoxBattleship).EndInit();
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private PictureBox pictureBoxBattleship;
-        private Button buttonCreate;
-        private Button buttonLeft;
-        private Button buttonUp;
-        private Button buttonDown;
-        private Button buttonRight;
-        private Button buttonCreateShip;
-        private ComboBox comboBoxStrategy;
-        private Button buttonStrategyStep;
-    }
-}

ProjectBattleship/ProjectBattleship/FormBattleship.cs

@@ -1,119 +0,0 @@
-using ProjectBattleship.Drawning;
-using ProjectBattleship.MovementStrategy;
-using ProjectBattleship.MovementStrateg;
-
-namespace ProjectBattleship
-{
-    public partial class FormBattleship : Form
-    {
-        private DrawingShip? _drawingShip;
-        private AbstractStrategy? _strategy;
-        public FormBattleship()
-        {
-            InitializeComponent();
-            _strategy = null;
-        }
-        private void Draw()
-        {
-            if (_drawingShip == null)
-            {
-                return;
-            }
-            Bitmap bmp = new Bitmap(pictureBoxBattleship.Width, pictureBoxBattleship.Height);
-            Graphics gr = Graphics.FromImage(bmp);
-            _drawingShip.DrawTransport(gr);
-            pictureBoxBattleship.Image = bmp;
-        }
-        private void CreateObject(string type)
-        {
-            Random random = new();
-            switch (type)
-            {
-                case nameof(DrawingShip):
-                    _drawingShip = new DrawingShip(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(DrawingBattleship):
-                    _drawingShip = new DrawingBattleship(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)));
-                    break;
-                default:
-                    return;
-            }
-            _drawingShip.SetPictureSize(pictureBoxBattleship.Width, pictureBoxBattleship.Height);
-            _drawingShip.SetPosition(random.Next(10, 100), random.Next(10, 100));
-            _strategy = null;
-            comboBoxStrategy.Enabled = true;
-            Draw();
-        }
-        private void buttonCreate_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingBattleship));
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            if (_drawingShip == null)
-            {
-                return;
-            }
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            bool result = false;
-            switch (name)
-            {
-                case "buttonUp":
-                    result =
-                    _drawingShip.MoveTransport(DirectionType.Up);
-                    break;
-                case "buttonDown":
-                    result =
-                    _drawingShip.MoveTransport(DirectionType.Down);
-                    break;
-                case "buttonLeft":
-                    result =
-                    _drawingShip.MoveTransport(DirectionType.Left);
-                    break;
-                case "buttonRight":
-                    result =
-                    _drawingShip.MoveTransport(DirectionType.Right);
-                    break;
-            }
-            if (result)
-            {
-                Draw();
-            }
-        }
-        private void buttonCreateShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingShip));
-        private void buttonStrategyStep_Click(object sender, EventArgs e)
-        {
-            if (_drawingShip == null)
-            {
-                return;
-            }
-            if (comboBoxStrategy.Enabled)
-            {
-                _strategy = comboBoxStrategy.SelectedIndex switch
-                {
-                    0 => new MoveToCenter(),
-                    1 => new MoveToBorder(),
-                    _ => null,
-                };
-                if (_strategy == null)
-                {
-                    return;
-                }
-                _strategy.SetData(new MoveableShip(_drawingShip), pictureBoxBattleship.Width, pictureBoxBattleship.Height);
-            }
-            if (_strategy == null)
-            {
-                return;
-            }
-            comboBoxStrategy.Enabled = false;
-            _strategy.MakeStep();
-            Draw();
-            if (_strategy.GetStatus() == StrategyStatus.Finish)
-            {
-                comboBoxStrategy.Enabled = true;
-                _strategy = null;
-            }
-        }
-    }
-}

ProjectBattleship/ProjectBattleship/IMoveableObject.cs

@@ -1,7 +0,0 @@
-namespace ProjectBattleship.MovementStrategy;
-public interface IMoveableObject
-{
-    ObjectParameters? GetObjectPosition { get; }
-    int GetStep { get; }
-    bool TryMoveObject(MovementDirection direction);
-}

ProjectBattleship/ProjectBattleship/MoveToBorder.cs

@@ -1,25 +0,0 @@
-namespace ProjectBattleship.MovementStrategy;
-public class MoveToBorder : AbstractStrategy
-{
-    protected override bool IsTargetDestinaion()
-    {
-        ObjectParameters? objParams = GetObjectParameters;
-        if (objParams == null)
-        {
-            return false;
-        }
-        return objParams.LeftBorder - GetStep() <= 0 || objParams.RightBorder + GetStep() >= FieldWidth || objParams.TopBorder - GetStep() <= 0 || objParams.ObjectMiddleVertical + GetStep() >= FieldHeight;
-    }
-    protected override void MoveToTarget()
-    {
-        ObjectParameters? objParams = GetObjectParameters;
-        if (objParams == null)
-        {
-            return;
-        }
-        int x = objParams.RightBorder;
-        if (x + GetStep() < FieldWidth) MoveRight();
-        int y = objParams.DownBorder;
-        if (y + GetStep() < FieldHeight) MoveDown();
-    }
-}

ProjectBattleship/ProjectBattleship/MoveToCenter.cs

@@ -1,46 +0,0 @@
-namespace ProjectBattleship.MovementStrategy;
-public class MoveToCenter : AbstractStrategy
-{
-    protected override bool IsTargetDestinaion()
-    {
-        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();
-            }
-        }
-    }
-}

ProjectBattleship/ProjectBattleship/MoveableShip.cs

@@ -1,42 +0,0 @@
-using ProjectBattleship.Drawning;
-
-namespace ProjectBattleship.MovementStrategy;
-public class MoveableShip : IMoveableObject
-{
-    private readonly DrawingShip? _ship = null;
-    public MoveableShip(DrawingShip ship)
-    {
-        _ship = ship;
-    }
-    public ObjectParameters? GetObjectPosition
-    {
-        get
-        {
-            if (_ship == null || _ship.EntityShip == null || !_ship.GetPosX.HasValue || !_ship.GetPosY.HasValue)
-            {
-                return null;
-            }
-            return new ObjectParameters(_ship.GetPosX.Value, _ship.GetPosY.Value, _ship.GetWidth, _ship.GetHeight);
-        }
-    }
-    public int GetStep => (int)(_ship?.EntityShip?.Step ?? 0);
-    public bool TryMoveObject(MovementDirection direction)
-    {
-        if (_ship == null || _ship.EntityShip == null)
-        {
-            return false;
-        }
-        return _ship.MoveTransport(GetDirectionType(direction));
-    }
-    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,
-        };
-    }
-}

ProjectBattleship/ProjectBattleship/MovementDirection.cs

@@ -1,8 +0,0 @@
-namespace ProjectBattleship.MovementStrategy;
-public enum MovementDirection
-{
-    Up = 1,
-    Down = 2,
-    Left = 3,
-    Right = 4
-}

ProjectBattleship/ProjectBattleship/ObjectParameters.cs

@@ -1,21 +0,0 @@
-namespace ProjectBattleship.MovementStrategy;
-public class ObjectParameters
-{
-    private readonly int _x;
-    private readonly int _y;
-    private readonly int _width;
-    private readonly int _height;
-    public int LeftBorder => _x;
-    public int TopBorder => _y;
-    public int RightBorder => _x + _width;
-    public int DownBorder => _y + _height;
-    public int ObjectMiddleHorizontal => _x + _width / 2;
-    public int ObjectMiddleVertical => _y + _height / 2;
-    public ObjectParameters(int x, int y, int width, int height)
-    {
-        _x = x;
-        _y = y;
-        _width = width;
-        _height = height;
-    }
-}

ProjectBattleship/ProjectBattleship/Program.cs

@@ -11,7 +11,7 @@ namespace ProjectBattleship
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormBattleship());
+            Application.Run(new Form1());
         }
     }
 }

ProjectBattleship/ProjectBattleship/ProjectBattleship.csproj

@@ -8,19 +8,4 @@
     <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>

ProjectBattleship/ProjectBattleship/Properties/Resources.Designer.cs

@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
-//
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ProjectBattleship.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("ProjectBattleship.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;
-            }
-        }
-    }
-}

ProjectBattleship/ProjectBattleship/Properties/Resources.resx

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

ProjectBattleship/ProjectBattleship/StrategyStatus.cs

@@ -1,9 +0,0 @@
-namespace ProjectBattleship.MovementStrateg
-{
-    public enum StrategyStatus
-    {
-        NotInit,
-        InProgress,
-        Finish
-    }
-}