From 1d3cf33ca356265b6adaf2b776a27942e0477c52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D1=8F=D1=80=20=D0=90=D0=B3=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=83=D0=BB=D0=BB=D0=BE=D0=B2?= <danuar228@mail.ru>
Date: Fri, 30 Sep 2022 18:24:01 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=BA=D0=BE=D1=80=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D1=8B=20?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=80=D1=8B=20=D1=81=D0=B0=D0=BC?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=B5=D1=82=D0=BE=D0=B2=20=D0=B8=20=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B3=D0=B0=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AirBomber/AirBomber/DrawningAirBomber.cs      |  2 +-
 .../AirBomber/MapWithSetAirplanesGeneric.cs   | 23 ++++++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/AirBomber/AirBomber/DrawningAirBomber.cs b/AirBomber/AirBomber/DrawningAirBomber.cs
index 2f5da52..0705593 100644
--- a/AirBomber/AirBomber/DrawningAirBomber.cs
+++ b/AirBomber/AirBomber/DrawningAirBomber.cs
@@ -20,7 +20,7 @@ namespace AirBomber
         /// <param name="hasBombs">Признак наличия бомб</param>
         /// <param name="hasFuelTanks">Признак наличия топливных баков</param>
         public DrawningAirBomber(int speed, float weight, Color bodyColor, Color dopColor, bool hasBombs, bool hasFuelTanks) 
-            : base(speed, weight, bodyColor, 115, 155)
+            : base(speed, weight, bodyColor, 95, 110)
         {
             Airplane = new EntityAirBomber(speed, weight, bodyColor, dopColor, hasBombs, hasFuelTanks);
         }
diff --git a/AirBomber/AirBomber/MapWithSetAirplanesGeneric.cs b/AirBomber/AirBomber/MapWithSetAirplanesGeneric.cs
index 352064c..f1b5c96 100644
--- a/AirBomber/AirBomber/MapWithSetAirplanesGeneric.cs
+++ b/AirBomber/AirBomber/MapWithSetAirplanesGeneric.cs
@@ -25,7 +25,7 @@ namespace AirBomber
         /// <summary>
         /// Размер занимаемого объектом места (высота)
         /// </summary>
-        private readonly int _placeSizeHeight = 90;
+        private readonly int _placeSizeHeight = 190;
         /// <summary>
         /// Набор объектов
         /// </summary>
@@ -147,13 +147,24 @@ namespace AirBomber
             Pen pen = new(Color.Black, 3);
             for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
             {
-                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
-                {//линия рамзетки места
-                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
+                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; j++)
+                {
+                    DrawHangar(g, pen, new RectangleF(i * _placeSizeWidth, j * _placeSizeHeight, _placeSizeWidth / 1.8F, _placeSizeHeight / 1.6F));
+                    // g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
                 }
-                g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
             }
         }
+
+        private void DrawHangar(Graphics g, Pen pen, RectangleF rect)
+        {
+            g.DrawLine(pen, rect.Left , rect.Top   , rect.Right, rect.Top   );
+            g.DrawLine(pen, rect.Right, rect.Top   , rect.Right, rect.Bottom);
+            g.DrawLine(pen, rect.Right, rect.Bottom, rect.Left , rect.Bottom);
+
+            // Края ворот ангара
+            g.DrawLine(pen, rect.Left, rect.Top   , rect.Left, rect.Top    + rect.Height / 10);
+            g.DrawLine(pen, rect.Left, rect.Bottom, rect.Left, rect.Bottom - rect.Height / 10);
+        }
         /// <summary>
         /// Метод прорисовки объектов
         /// </summary>
@@ -165,7 +176,7 @@ namespace AirBomber
             for (int i = 0; i < _setAirplanes.Count; i++)
             {
                 var airplane = _setAirplanes.Get(i);
-                airplane?.SetObject(maxLeft - i % countInLine * _placeSizeWidth, i / countInLine * _placeSizeHeight, _pictureWidth, _pictureHeight);
+                airplane?.SetObject(maxLeft - i % countInLine * _placeSizeWidth, i / countInLine * _placeSizeHeight + 3, _pictureWidth, _pictureHeight);
                 airplane?.DrawningObject(g);
             }
         }