From 45be5ff31c88cf599cdf1ef6f1e89c097c322b14 Mon Sep 17 00:00:00 2001
From: AnnZhimol <ankavanka731@gmail.com>
Date: Sat, 29 Oct 2022 00:00:17 +0400
Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BD=D0=B0=D1=8F=20=D1=83=D1=81=D0=BB=D0=BE=D0=B6=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D0=B0=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80?=
 =?UTF-8?q?=D0=B0=D1=82=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=BE=D1=82=D0=B0=20=E2=84=963(=D1=82=D0=BE=D1=87=D0=BD=D0=BE)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/CreaterGeneric.java         | 12 +++++++++++-
 src/DrawingAdvancedWarship.java |  4 ++++
 src/DrawingWarship.java         |  4 ++++
 src/FormCreater.java            |  5 ++---
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/CreaterGeneric.java b/src/CreaterGeneric.java
index 24b22dd..34288e1 100644
--- a/src/CreaterGeneric.java
+++ b/src/CreaterGeneric.java
@@ -25,5 +25,15 @@ public class CreaterGeneric<T extends EntityWarship, U extends IDrawingObjectBlo
         }
         return -1;
     }
-
+    public DrawingWarship NewWarshipCreating()
+    {
+        Random rand=new Random();
+        DrawingWarship finalWarship;
+        T warship = (T)Warships[rand.nextInt(WarshipsCount)];
+        U block = (U)Blocks[rand.nextInt(BlocksCount)];
+        if(warship instanceof EntityAdvancedWarship){
+            return new DrawingAdvancedWarship(warship,block);
+        }
+        return new DrawingWarship(warship,block);
+    }
 }
diff --git a/src/DrawingAdvancedWarship.java b/src/DrawingAdvancedWarship.java
index bfe1257..2628b46 100644
--- a/src/DrawingAdvancedWarship.java
+++ b/src/DrawingAdvancedWarship.java
@@ -13,6 +13,10 @@ public class DrawingAdvancedWarship extends DrawingWarship {
         Warship=new EntityAdvancedWarship(speed,weight,bodyColor,dopColor,Helipad,Antenna,Missile);
         Blocks= blockForm;
     }
+    public DrawingAdvancedWarship(EntityWarship warship,IDrawingObjectBlock block){
+        super(warship,block);
+        Warship = warship;
+    }
 
     @Override
     public void DrawTransport(Graphics g) {
diff --git a/src/DrawingWarship.java b/src/DrawingWarship.java
index 6542488..7496ee8 100644
--- a/src/DrawingWarship.java
+++ b/src/DrawingWarship.java
@@ -25,6 +25,10 @@ public class DrawingWarship {
         Warship = new EntityWarship(speed, weight, bodyColor);
         Blocks= blockForm;
     }
+    public DrawingWarship(EntityWarship warship,IDrawingObjectBlock block){
+        Warship = warship;
+        Blocks = block;
+    }
 
     public IDrawingObjectBlock GetFormOfBlock(int FormOfBlock){
         BlockForm temp = null;
diff --git a/src/FormCreater.java b/src/FormCreater.java
index 665ac62..dfe5bb9 100644
--- a/src/FormCreater.java
+++ b/src/FormCreater.java
@@ -99,7 +99,7 @@ public class FormCreater extends JDialog{
                     return;
                 }
                 createrGeneric.AddWarship(new EntityWarship(Integer.parseInt(SpeedTextField.getText()),Integer.parseInt(WeightTextField.getText()),color));
-                _warship=new DrawingWarship(Integer.parseInt(SpeedTextField.getText()),Integer.parseInt(WeightTextField.getText()),color, fblock);
+                _warship=createrGeneric.NewWarshipCreating();
             }
             if (AdvancedRadioButton.isSelected()){
                 Color color1=JColorChooser.showDialog(this,"Выберите цвет корпуса корабля",Color.WHITE);
@@ -112,8 +112,7 @@ public class FormCreater extends JDialog{
                 }
                 createrGeneric.AddWarship(new EntityAdvancedWarship(Integer.parseInt(SpeedTextField.getText()),Integer.parseInt(WeightTextField.getText()),
                         color1,color2,HelipadCheckBox.isSelected(),AntennaCheckBox.isSelected(),MissileCheckBox.isSelected()));
-                _warship=new DrawingAdvancedWarship(Integer.parseInt(SpeedTextField.getText()),Integer.parseInt(WeightTextField.getText()),color1,color2,
-                        HelipadCheckBox.isSelected(),AntennaCheckBox.isSelected(),MissileCheckBox.isSelected(),fblock);
+                _warship=createrGeneric.NewWarshipCreating();
             }
             _warship.SetPosition(rand.nextInt(100),rand.nextInt(100),getWidth(),getHeight());
             repaint();