From 6382b1154237e55756f710a2368bd3f25365d45b Mon Sep 17 00:00:00 2001
From: "ns.potapov" <ns.potapov@yandex.ru>
Date: Wed, 13 Sep 2023 12:28:57 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D0=B4=D0=BE=D0=BF.=20=D0=BF=D0=B5=D1=80=D0=B5?=
 =?UTF-8?q?=D1=87=D0=B8=D1=81=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=20?=
 =?UTF-8?q?=D0=BE=D1=82=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=20=D0=BA=D0=BE=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ProjectStormtrooper/DrawingStormtrooper.java         |  3 +--
 ProjectStormtrooper/EntityStormtrooper.java          |  2 ++
 .../{DirectionType.java => EnumDirectionType.java}   |  2 +-
 ProjectStormtrooper/EnumEnginesCount.java            | 12 ++++++++++++
 ProjectStormtrooper/FormStormtrooper.java            | 12 +++++++-----
 ProjectStormtrooper/MainFrameStormtrooper.java       |  1 +
 6 files changed, 24 insertions(+), 8 deletions(-)
 rename ProjectStormtrooper/{DirectionType.java => EnumDirectionType.java} (64%)
 create mode 100644 ProjectStormtrooper/EnumEnginesCount.java

diff --git a/ProjectStormtrooper/DrawingStormtrooper.java b/ProjectStormtrooper/DrawingStormtrooper.java
index d9ec978..36ba9b4 100644
--- a/ProjectStormtrooper/DrawingStormtrooper.java
+++ b/ProjectStormtrooper/DrawingStormtrooper.java
@@ -1,7 +1,6 @@
 package ProjectStormtrooper;
 
 import java.awt.*;
-import java.awt.geom.Rectangle2D;
 
 public class DrawingStormtrooper {
     public EntityStormtrooper EntityStormtrooper;
@@ -41,7 +40,7 @@ public class DrawingStormtrooper {
         _startPosY = y;
     }
 
-    public void MoveTransport(DirectionType direction) {
+    public void MoveTransport(EnumDirectionType direction) {
         if (EntityStormtrooper == null) {
             return;
         }
diff --git a/ProjectStormtrooper/EntityStormtrooper.java b/ProjectStormtrooper/EntityStormtrooper.java
index a656f32..2570ba4 100644
--- a/ProjectStormtrooper/EntityStormtrooper.java
+++ b/ProjectStormtrooper/EntityStormtrooper.java
@@ -9,9 +9,11 @@ public class EntityStormtrooper {
     public Color AdditionalColor;
     public boolean Rockets;
     public boolean Bombs;
+
     public double Step() {
         return (double) Speed * 250 / Weight;
     }
+
     public void Init(int speed, double weight, Color bodyColor, Color additionalColor, boolean rockets, boolean bombs) {
         Speed = speed;
         Weight = weight;
diff --git a/ProjectStormtrooper/DirectionType.java b/ProjectStormtrooper/EnumDirectionType.java
similarity index 64%
rename from ProjectStormtrooper/DirectionType.java
rename to ProjectStormtrooper/EnumDirectionType.java
index 723124e..c7c3cd6 100644
--- a/ProjectStormtrooper/DirectionType.java
+++ b/ProjectStormtrooper/EnumDirectionType.java
@@ -1,5 +1,5 @@
 package ProjectStormtrooper;
 
-public enum DirectionType {
+public enum EnumDirectionType {
     Up, Down, Left, Right
 }
diff --git a/ProjectStormtrooper/EnumEnginesCount.java b/ProjectStormtrooper/EnumEnginesCount.java
new file mode 100644
index 0000000..475628b
--- /dev/null
+++ b/ProjectStormtrooper/EnumEnginesCount.java
@@ -0,0 +1,12 @@
+package ProjectStormtrooper;
+
+public enum EnumEnginesCount {
+    Two(2),
+    Four(4),
+    Six(6);
+    public final int count;
+
+    EnumEnginesCount(int count) {
+        this.count = count;
+    }
+}
diff --git a/ProjectStormtrooper/FormStormtrooper.java b/ProjectStormtrooper/FormStormtrooper.java
index d55aca8..2ae42f0 100644
--- a/ProjectStormtrooper/FormStormtrooper.java
+++ b/ProjectStormtrooper/FormStormtrooper.java
@@ -3,7 +3,6 @@ package ProjectStormtrooper;
 import javax.swing.*;
 import java.awt.*;
 import java.util.Random;
-import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 public class FormStormtrooper {
@@ -14,9 +13,11 @@ public class FormStormtrooper {
     private JButton buttonUp;
     private JButton buttonLeft;
     private JButton buttonRight;
+
     public JPanel getPictureBox() {
         return pictureBox;
     }
+
     public FormStormtrooper() {
         buttonUp.setName("buttonUp");
         buttonDown.setName("buttonDown");
@@ -48,16 +49,16 @@ public class FormStormtrooper {
 
             switch (buttonName) {
                 case ("buttonUp") -> {
-                    _drawingStormtrooper.MoveTransport(DirectionType.Up);
+                    _drawingStormtrooper.MoveTransport(EnumDirectionType.Up);
                 }
                 case ("buttonDown") -> {
-                    _drawingStormtrooper.MoveTransport(DirectionType.Down);
+                    _drawingStormtrooper.MoveTransport(EnumDirectionType.Down);
                 }
                 case ("buttonLeft") -> {
-                    _drawingStormtrooper.MoveTransport(DirectionType.Left);
+                    _drawingStormtrooper.MoveTransport(EnumDirectionType.Left);
                 }
                 case ("buttonRight") -> {
-                    _drawingStormtrooper.MoveTransport(DirectionType.Right);
+                    _drawingStormtrooper.MoveTransport(EnumDirectionType.Right);
                 }
             }
 
@@ -69,6 +70,7 @@ public class FormStormtrooper {
         buttonLeft.addActionListener(buttonMoveClickedListener);
         buttonRight.addActionListener(buttonMoveClickedListener);
     }
+
     public void Draw() {
         if (_drawingStormtrooper.EntityStormtrooper == null) {
             return;
diff --git a/ProjectStormtrooper/MainFrameStormtrooper.java b/ProjectStormtrooper/MainFrameStormtrooper.java
index 41f5dc1..670d59e 100644
--- a/ProjectStormtrooper/MainFrameStormtrooper.java
+++ b/ProjectStormtrooper/MainFrameStormtrooper.java
@@ -4,6 +4,7 @@ import javax.swing.*;
 
 public class MainFrameStormtrooper extends JFrame {
     private FormStormtrooper _formStormtrooper;
+
     public MainFrameStormtrooper() {
         super();
         setTitle("Штурмовик");