Добавлены элементы формы и реализована недостающая логика с проверками

ProjectStormtrooper/ProjectStormtrooper/DrawingStormTrooper.cs

@@ -57,6 +57,10 @@ namespace ProjectStormtrooper
             int width, int height)
         {
             // TODO: продумать проверки
+            if (width < _stormtrooperWidth && height < _stormtrooperHeight)
+            {
+                return false;
+            }
             _pictureWidth = width;
             _pictureHeight = height;
             EntityStormtrooper = new EntityStormtrooper();
@@ -71,7 +75,24 @@ namespace ProjectStormtrooper
         public void SetPosition(int x, int y)
         {
             // TODO: изменение X и Y
+            if (x < 0)
+            {
+                x = 0;
+            }
+            else if (x > _pictureWidth - _stormtrooperWidth)
+            {
+                x = _pictureWidth - _stormtrooperWidth;
+            }
             _startPosX = x;
+
+            if (y < 0)
+            {
+                y = 0;
+            }
+            else if (y > _pictureHeight - _stormtrooperHeight)
+            {
+                y = _pictureHeight - _stormtrooperHeight;
+            }
             _startPosY = y;
         }
         /// <summary>
@@ -88,7 +109,7 @@ namespace ProjectStormtrooper
             {
                 // Вверх
                 case DirectionType.Up:
-                    if (_startPosY - EntityStormtrooper.Step > 0)
+                    if (_startPosY - EntityStormtrooper.Step >= 0)
                     {
                         _startPosY -= (int)EntityStormtrooper.Step;
                     }
@@ -96,10 +117,14 @@ namespace ProjectStormtrooper
                 // Вниз
                 case DirectionType.Down:
                     // TODO: Продумать логику
+                    if (_startPosY + _stormtrooperHeight + EntityStormtrooper.Step <= _pictureHeight)
+                    {
+                        _startPosY += (int)EntityStormtrooper.Step;
+                    }
                     break;
                 // Влево
                 case DirectionType.Left:
-                    if (_startPosX - EntityStormtrooper.Step > 0)
+                    if (_startPosX - EntityStormtrooper.Step >= 0)
                     {
                         _startPosX -= (int)EntityStormtrooper.Step;
                     }
@@ -107,6 +132,10 @@ namespace ProjectStormtrooper
                 // Вправо
                 case DirectionType.Right:
                     // TODO: Продумать логику
+                    if (_startPosX + _stormtrooperWidth + EntityStormtrooper.Step <= _pictureWidth)
+                    {
+                        _startPosX += (int)EntityStormtrooper.Step;
+                    }
                     break;
             }
         }

ProjectStormtrooper/ProjectStormtrooper/EntityStormtrooper.cs

@@ -36,7 +36,7 @@ namespace ProjectStormtrooper
         /// <summary>
         /// Шаг перемещения
         /// </summary>
-        public double Step => (double)Speed * 100 / Weight;
+        public double Step => (double)Speed * 500 / Weight;
         /// <summary>
         /// Инициализация полей объекта-класса штурмовика
         /// </summary>

ProjectStormtrooper/ProjectStormtrooper/FormStormtrooper.Designer.cs

@@ -28,12 +28,110 @@
         /// </summary>
         private void InitializeComponent()
         {
-            components = new System.ComponentModel.Container();
+            pictureBoxStormtrooper = new PictureBox();
+            buttonCreate = new Button();
+            buttonUp = new Button();
+            buttonDown = new Button();
+            buttonLeft = new Button();
+            buttonRight = new Button();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxStormtrooper).BeginInit();
+            SuspendLayout();
+            // 
+            // pictureBoxStormtrooper
+            // 
+            pictureBoxStormtrooper.Dock = DockStyle.Fill;
+            pictureBoxStormtrooper.Location = new Point(0, 0);
+            pictureBoxStormtrooper.Name = "pictureBoxStormtrooper";
+            pictureBoxStormtrooper.Size = new Size(882, 453);
+            pictureBoxStormtrooper.SizeMode = PictureBoxSizeMode.AutoSize;
+            pictureBoxStormtrooper.TabIndex = 0;
+            pictureBoxStormtrooper.TabStop = false;
+            // 
+            // buttonCreate
+            // 
+            buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            buttonCreate.Location = new Point(12, 412);
+            buttonCreate.Name = "buttonCreate";
+            buttonCreate.Size = new Size(94, 29);
+            buttonCreate.TabIndex = 1;
+            buttonCreate.Text = "Создать";
+            buttonCreate.UseVisualStyleBackColor = true;
+            buttonCreate.Click += buttonCreate_Click;
+            // 
+            // buttonUp
+            // 
+            buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonUp.BackgroundImage = Properties.Resources.arrowUP;
+            buttonUp.BackgroundImageLayout = ImageLayout.Zoom;
+            buttonUp.Location = new Point(804, 375);
+            buttonUp.Name = "buttonUp";
+            buttonUp.Size = new Size(30, 30);
+            buttonUp.TabIndex = 2;
+            buttonUp.UseVisualStyleBackColor = true;
+            buttonUp.Click += buttonMove_Click;
+            // 
+            // buttonDown
+            // 
+            buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonDown.BackgroundImage = Properties.Resources.arrowDOWN;
+            buttonDown.BackgroundImageLayout = ImageLayout.Zoom;
+            buttonDown.Location = new Point(804, 411);
+            buttonDown.Name = "buttonDown";
+            buttonDown.Size = new Size(30, 30);
+            buttonDown.TabIndex = 3;
+            buttonDown.UseVisualStyleBackColor = true;
+            buttonDown.Click += buttonMove_Click;
+            // 
+            // buttonLeft
+            // 
+            buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonLeft.BackgroundImage = Properties.Resources.arrowLEFT;
+            buttonLeft.BackgroundImageLayout = ImageLayout.Zoom;
+            buttonLeft.Location = new Point(768, 411);
+            buttonLeft.Name = "buttonLeft";
+            buttonLeft.Size = new Size(30, 30);
+            buttonLeft.TabIndex = 4;
+            buttonLeft.UseVisualStyleBackColor = true;
+            buttonLeft.Click += buttonMove_Click;
+            // 
+            // buttonRight
+            // 
+            buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonRight.BackgroundImage = Properties.Resources.arrowRIGHT;
+            buttonRight.BackgroundImageLayout = ImageLayout.Zoom;
+            buttonRight.Location = new Point(840, 411);
+            buttonRight.Name = "buttonRight";
+            buttonRight.Size = new Size(30, 30);
+            buttonRight.TabIndex = 5;
+            buttonRight.UseVisualStyleBackColor = true;
+            buttonRight.Click += buttonMove_Click;
+            // 
+            // FormStormtrooper
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(800, 450);
+            ClientSize = new Size(882, 453);
-            Text = "Form1";
+            Controls.Add(buttonRight);
+            Controls.Add(buttonLeft);
+            Controls.Add(buttonDown);
+            Controls.Add(buttonUp);
+            Controls.Add(buttonCreate);
+            Controls.Add(pictureBoxStormtrooper);
+            Name = "FormStormtrooper";
+            StartPosition = FormStartPosition.CenterScreen;
+            Text = "Штурмовик";
+            ((System.ComponentModel.ISupportInitialize)pictureBoxStormtrooper).EndInit();
+            ResumeLayout(false);
+            PerformLayout();
         }
 
         #endregion
+
+        private PictureBox pictureBoxStormtrooper;
+        private Button buttonCreate;
+        private Button buttonUp;
+        private Button buttonDown;
+        private Button buttonLeft;
+        private Button buttonRight;
     }
 }

ProjectStormtrooper/ProjectStormtrooper/FormStormtrooper.cs

@@ -1,10 +1,85 @@
 namespace ProjectStormtrooper
 {
+    /// <summary>
+    /// Ôîðìà äëÿ ðàáîòû ñ îáúåêòîì "Øòóðìîâèê"
+    /// </summary>
     public partial class FormStormtrooper : Form
     {
+        /// <summary>
+        /// Ïîëå-îáúåêò äëÿ ïðîðèñîâêè îáúåêòà
+        /// </summary>
+        private DrawingStormtrooper? _drawingStormtrooper;
+        /// <summary>
+        /// Èíèöèàëèçàöèÿ ôîðìû
+        /// </summary>
         public FormStormtrooper()
         {
             InitializeComponent();
         }
+        /// <summary>
+        /// Ìåòîä ïðîðèñîâêè îáúåêòà
+        /// </summary>
+        private void Draw()
+        {
+            if (_drawingStormtrooper == null)
+            {
+                return;
+            }
+            Bitmap bmp = new(pictureBoxStormtrooper.Width, pictureBoxStormtrooper.Height);
+            Graphics g = Graphics.FromImage(bmp);
+            _drawingStormtrooper.DrawTransport(g);
+            pictureBoxStormtrooper.Image = bmp;
+        }
+        /// <summary>
+        /// Îáðàáîò÷èê íàæàòèÿ êíîïêè "Ñîçäàòü"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonCreate_Click(object sender, EventArgs e)
+        {
+            Random random = new();
+            _drawingStormtrooper = new DrawingStormtrooper();
+            _drawingStormtrooper.Init(
+                    random.Next(100, 300),
+                    random.Next(1000, 3000),
+                    Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+                    Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+                    Convert.ToBoolean(random.Next(0, 2)),
+                    Convert.ToBoolean(random.Next(0, 2)),
+                    pictureBoxStormtrooper.Width,
+                    pictureBoxStormtrooper.Height
+                );
+            _drawingStormtrooper.SetPosition(random.Next(10, 100), random.Next(10, 100));
+            Draw();
+        }
+        /// <summary>
+        /// Îáðàáîò÷èê íàæàòèÿ êíîïîê ïåðåìåùåíèÿ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonMove_Click(object sender, EventArgs e)
+        {
+            if (_drawingStormtrooper == null)
+            {
+                return;
+            }
+            string buttonName = ((Button)sender)?.Name ?? string.Empty;
+            switch (buttonName)
+            {
+                case "buttonUp":
+                    _drawingStormtrooper.MoveTransport(DirectionType.Up);
+                    break;
+                case "buttonDown":
+                    _drawingStormtrooper.MoveTransport(DirectionType.Down);
+                    break;
+                case "buttonLeft":
+                    _drawingStormtrooper.MoveTransport(DirectionType.Left);
+                    break;
+                case "buttonRight":
+                    _drawingStormtrooper.MoveTransport(DirectionType.Right);
+                    break;
+            }
+            Draw();
+        }
     }
 }

ProjectStormtrooper/ProjectStormtrooper/ProjectStormtrooper.csproj

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

ProjectStormtrooper/ProjectStormtrooper/Properties/Resources.Designer.cs

@@ -0,0 +1,103 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Этот код создан программой.
+//     Исполняемая версия:4.0.30319.42000
+//
+//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+//     повторной генерации кода.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace ProjectStormtrooper.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("ProjectStormtrooper.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Перезаписывает свойство CurrentUICulture текущего потока для всех
+        ///   обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap arrowDOWN {
+            get {
+                object obj = ResourceManager.GetObject("arrowDOWN", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap arrowLEFT {
+            get {
+                object obj = ResourceManager.GetObject("arrowLEFT", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap arrowRIGHT {
+            get {
+                object obj = ResourceManager.GetObject("arrowRIGHT", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap arrowUP {
+            get {
+                object obj = ResourceManager.GetObject("arrowUP", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}

ProjectStormtrooper/ProjectStormtrooper/Properties/Resources.resx

@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="arrowLEFT" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrowLEFT.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="arrowDOWN" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrowDOWN.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="arrowRIGHT" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrowRIGHT.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="arrowUP" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrowUP.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>