From bd1882b5cff39f95129df6b55a7fbedc405bdfed Mon Sep 17 00:00:00 2001 From: xom9kxom9k Date: Thu, 7 Mar 2024 18:22:00 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=962=20=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AntiAircraftGun/Drawnings/DrawningAircraftGun.cs | 6 ++---- AntiAircraftGun/Drawnings/DrawningAntiAircraftGun.cs | 5 ++--- AntiAircraftGun/Entities/EntityAircraftGun.cs | 4 +++- AntiAircraftGun/Entities/EntityAntiAircraftGun.cs | 8 +------- AntiAircraftGun/FormAntiAircraftGun.cs | 12 ++++++++++-- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/AntiAircraftGun/Drawnings/DrawningAircraftGun.cs b/AntiAircraftGun/Drawnings/DrawningAircraftGun.cs index 4a414ca..3c483ba 100644 --- a/AntiAircraftGun/Drawnings/DrawningAircraftGun.cs +++ b/AntiAircraftGun/Drawnings/DrawningAircraftGun.cs @@ -104,8 +104,7 @@ public class DrawningAircraftGun /// public bool SetPictureSize(int width, int height) { - // TODO проверка, что объект "влезает" в размеры поля - // если влезает, сохраняем границы и корректируем позицию объекта,если она была уже установлена + if (width < _drawningGunWidth || height < _drawningGunHeight) { return false; }; _pictureWidth = width; _pictureHeight = height; @@ -138,8 +137,7 @@ public class DrawningAircraftGun public void SetPosition(int x, int y) { - // TODO если при установке объекта в эти координаты, он будет "выходить" за границы формы - // то надо изменить координаты, чтобы он оставался в этих границах + if (!_pictureHeight.HasValue || !_pictureWidth.HasValue) { return; diff --git a/AntiAircraftGun/Drawnings/DrawningAntiAircraftGun.cs b/AntiAircraftGun/Drawnings/DrawningAntiAircraftGun.cs index 8d34254..ffe3fd0 100644 --- a/AntiAircraftGun/Drawnings/DrawningAntiAircraftGun.cs +++ b/AntiAircraftGun/Drawnings/DrawningAntiAircraftGun.cs @@ -13,13 +13,12 @@ public class DrawningAntiAircraftGun : DrawningAircraftGun /// Вес /// Основной цвет /// Дополнительный цвет - /// Признак наличия обвесов /// Признак наличия башни /// Признак наличия радара - public DrawningAntiAircraftGun(int speed, double weight, Color bodyColor, Color additionalColor, bool bodyKit, bool radar, bool tower) : base(129, 60) + public DrawningAntiAircraftGun(int speed, double weight, Color bodyColor, Color additionalColor, bool radar, bool tower) : base(129, 105) { - EntityAircraftGun = new EntityAntiAircraftGun(speed, weight, bodyColor, radar, tower, bodyKit, additionalColor); + EntityAircraftGun = new EntityAntiAircraftGun(speed, weight, bodyColor, radar, tower, additionalColor); } /// /// Прорисовка объекта diff --git a/AntiAircraftGun/Entities/EntityAircraftGun.cs b/AntiAircraftGun/Entities/EntityAircraftGun.cs index aba41af..ab02782 100644 --- a/AntiAircraftGun/Entities/EntityAircraftGun.cs +++ b/AntiAircraftGun/Entities/EntityAircraftGun.cs @@ -5,7 +5,9 @@ using System.Text; using System.Threading.Tasks; namespace AntiAircraftGun.Entities; - +/// +/// Класс - сущность Бронированная машина +/// public class EntityAircraftGun { /// diff --git a/AntiAircraftGun/Entities/EntityAntiAircraftGun.cs b/AntiAircraftGun/Entities/EntityAntiAircraftGun.cs index 65ad7f2..c208dd2 100644 --- a/AntiAircraftGun/Entities/EntityAntiAircraftGun.cs +++ b/AntiAircraftGun/Entities/EntityAntiAircraftGun.cs @@ -9,10 +9,6 @@ public class EntityAntiAircraftGun : EntityAircraftGun /// public Color AdditionalColor { get; private set; } /// - /// Наличие обвеса - /// - public bool BodyKit { get; private set; } - /// /// Наличие башни /// public bool Tower { get; private set; } @@ -28,15 +24,13 @@ public class EntityAntiAircraftGun : EntityAircraftGun /// Вес /// Основной цвет /// Дополнительный цвет - /// Наличие обвеса /// Наличие башни /// Наличие радара - public EntityAntiAircraftGun(int speed, double weight, Color bodyColor, bool radar, bool tower, bool bodyKit, Color additionalColor) : base(speed, weight, bodyColor) + public EntityAntiAircraftGun(int speed, double weight, Color bodyColor, bool radar, bool tower, Color additionalColor) : base(speed, weight, bodyColor) { Radar = radar; Tower = tower; - BodyKit = bodyKit; AdditionalColor = additionalColor; } } diff --git a/AntiAircraftGun/FormAntiAircraftGun.cs b/AntiAircraftGun/FormAntiAircraftGun.cs index a7814e0..36dc9e2 100644 --- a/AntiAircraftGun/FormAntiAircraftGun.cs +++ b/AntiAircraftGun/FormAntiAircraftGun.cs @@ -35,6 +35,10 @@ namespace AntiAircraftGun _drawningAircraftGun.DrawTransport(gr); pictureBoxAntiAircraftGun.Image = bmp; } + /// + /// Метод создания объекта + /// + /// private void CreateObject(string type) { Random random = new(); @@ -48,7 +52,7 @@ namespace AntiAircraftGun _drawningAircraftGun = new DrawningAntiAircraftGun(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)), Convert.ToBoolean(random.Next(0, 2))); + Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); break; default: return; @@ -106,7 +110,11 @@ namespace AntiAircraftGun Draw(); } } - + /// + /// Метод выбора стратегии + /// + /// + /// private void buttonStrategyStep_Click(object sender, EventArgs e) { if (_drawningAircraftGun == null)