AirBomber/AirBomber/AdditionalGeneric.cs

@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AirBomber
+{
+    public class AdditionalGeneric<T, U>
+        where T : EntityAirPlane
+        where U : IDrawningEngines
+    {
+        private T[] planes;
+        private U[] engines;
+
+        private int planesCount = 0;
+        private int enginesCount = 0;
+
+        private int _pictureWidth;
+        private int _pictureHeight;
+
+        private Random random;
+
+        public AdditionalGeneric(int count, int width, int height)
+        {
+            planes = new T[count];
+            engines = new U[count];
+            
+            _pictureWidth = width;
+            _pictureHeight = height;
+
+            random = new Random();
+        }
+        public bool Add(T plane)
+        {
+            for (int i = 0; i < planes.Length; i++)
+            {
+                if (planes[i] == null)
+                {
+                    planes[i] = plane;
+                    planesCount++;
+                    return true;
+                }
+            }
+            return false;
+        }
+        public bool Add(U engine)
+        {
+            for (int i = 0; i < planes.Length; i++)
+            {
+                if (engines[i] == null)
+                {
+                    engines[i] = engine;
+                    enginesCount++;
+                    return true;
+                }
+            }
+            return false;
+        }
+        public DrawningAirPlane CreateDrawObject()
+        {
+            Random rand = new Random();
+            EntityAirPlane plane = planes[rand.Next(0, planesCount)];
+            IDrawningEngines engine = engines[rand.Next(0, enginesCount)];
+
+            if (plane is EntityAirBomber airBomber)
+            {
+                return new DrawningAirBomber(
+                    plane.Speed,
+                    plane.Weight,
+                    plane.BodyColor,
+                    airBomber.AdditionalColor,
+                    airBomber.Bombs,
+                    airBomber.FuelTanks,
+                    _pictureWidth,
+                    _pictureHeight,
+                    engine.GetAmount(),
+                    engine.GetShape()
+                );
+            }
+
+            return new DrawningAirPlane(
+                plane.Speed,
+                plane.Weight,
+                plane.BodyColor,
+                _pictureWidth,
+                _pictureHeight,
+                engine.GetAmount(),
+                engine.GetShape()
+            );
+        }
+
+
+    }
+}

AirBomber/AirBomber/DrawningEnginesCircle.cs

@@ -9,6 +9,21 @@ namespace AirBomber
     public class DrawningEnginesCircle : IDrawningEngines
     {
         private Engines amount;
+        public int GetShape()
+        {
+            return 2;
+        }
+        public int GetAmount()
+        {
+            int x = 0;
+            if (amount == Engines.Two)
+                x = 2;
+            if (amount == Engines.Four)
+                x = 4;
+            if (amount == Engines.Six)
+                x = 6;
+            return x;
+        }
         public void SetAmount(int a)
         {
             if (a <= 2)

AirBomber/AirBomber/DrawningEnginesRectangle.cs

@@ -10,6 +10,21 @@ namespace AirBomber
     public class DrawningEnginesRectangle : IDrawningEngines
     {
         private Engines amount;
+        public int GetShape()
+        {
+            return 0;
+        }
+        public int GetAmount()
+        {
+            int x = 0;
+            if (amount == Engines.Two)
+                x = 2;
+            if (amount == Engines.Four)
+                x = 4;
+            if (amount == Engines.Six)
+                x = 6;
+            return x;
+        }
         public void SetAmount(int a)
         {
             if (a <= 2)

AirBomber/AirBomber/DrawningEnginesTriangle.cs

@@ -9,6 +9,21 @@ namespace AirBomber
     public class DrawningEnginesTriangle : IDrawningEngines
     {
         private Engines amount;
+        public int GetShape()
+        {
+            return 1;
+        }
+        public int GetAmount()
+        {
+            int x = 0;
+            if (amount == Engines.Two)
+                x = 2;
+            if (amount == Engines.Four)
+                x = 4;
+            if (amount == Engines.Six)
+                x = 6;
+            return x;
+        }
         public void SetAmount(int a)
         {
             if (a <= 2)

AirBomber/AirBomber/FormAdditionalGeneric.Designer.cs

@@ -0,0 +1,39 @@
+namespace AirBomber
+{
+    partial class FormAdditionalGeneric
+    {
+        /// <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 = "FormAdditionalGeneric";
+        }
+
+        #endregion
+    }
+}

AirBomber/AirBomber/FormAdditionalGeneric.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace AirBomber
+{
+    public partial class FormAdditionalGeneric : Form
+    {
+        public FormAdditionalGeneric()
+        {
+            InitializeComponent();
+        }
+    }
+}

AirBomber/AirBomber/FormAdditionalGeneric.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>

AirBomber/AirBomber/IDrawningEngines.cs

@@ -6,9 +6,11 @@ using System.Threading.Tasks;
 
 namespace AirBomber
 {
-    internal interface IDrawningEngines
+    public interface IDrawningEngines
     {
         public void SetAmount(int a);
         public void DrawEngines(Graphics g, int _startPosX, int _startPosY);
+        public int GetAmount();
+        public int GetShape();
     }
 }