From 79b4ee847cac869a10a8d809b8b3cb45fa7aff09 Mon Sep 17 00:00:00 2001 From: Andrey_Abazov Date: Tue, 20 Sep 2022 11:43:09 +0400 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4?= =?UTF-8?q?=20=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D1=80=D1=83?= =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80=D1=8B.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirBomber/AirBomber/DrawingAirBomber.cs | 5 ++--- AirBomber/AirBomber/EntityAirBomber.cs | 2 +- AirBomber/AirBomber/FormAirBomber.cs | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/AirBomber/AirBomber/DrawingAirBomber.cs b/AirBomber/AirBomber/DrawingAirBomber.cs index 3f32384..74e8b6f 100644 --- a/AirBomber/AirBomber/DrawingAirBomber.cs +++ b/AirBomber/AirBomber/DrawingAirBomber.cs @@ -42,10 +42,9 @@ namespace AirBomber /// Скорость /// Вес бомбардировщика /// Цвет корпуса - public void Init(int speed, float weight, Color bodyColor) + public DrawingAirBomber(int speed, float weight, Color bodyColor) { - AirBomber = new EntityAirBomber(); - AirBomber.Init(speed, weight, bodyColor); + AirBomber = new EntityAirBomber(speed, weight, bodyColor); } /// diff --git a/AirBomber/AirBomber/EntityAirBomber.cs b/AirBomber/AirBomber/EntityAirBomber.cs index dfdae8a..3662c4b 100644 --- a/AirBomber/AirBomber/EntityAirBomber.cs +++ b/AirBomber/AirBomber/EntityAirBomber.cs @@ -34,7 +34,7 @@ namespace AirBomber /// /// /// - public void Init(int speed, float weight, Color bodyColor) + public EntityAirBomber (int speed, float weight, Color bodyColor) { Random rnd = new(); Speed = speed <= 0 ? rnd.Next(50, 150) : speed; diff --git a/AirBomber/AirBomber/FormAirBomber.cs b/AirBomber/AirBomber/FormAirBomber.cs index a854805..3f41ac3 100644 --- a/AirBomber/AirBomber/FormAirBomber.cs +++ b/AirBomber/AirBomber/FormAirBomber.cs @@ -24,8 +24,7 @@ namespace AirBomber private void buttonCreateAirBomber_Click(object sender, EventArgs e) { Random rnd = new(); - _airBomber = new DrawingAirBomber(); - _airBomber.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + _airBomber = new DrawingAirBomber(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); _airBomber.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxAirBomber.Width, pictureBoxAirBomber.Height); toolStripStatusLabelSpeed.Text = $": {_airBomber.AirBomber.Speed}"; toolStripStatusLabelWeight.Text = $": {_airBomber.AirBomber.Weight}"; -- 2.25.1 From f5f9486ec06cf0918b22e65915f3fb93b37db98c Mon Sep 17 00:00:00 2001 From: Andrey_Abazov Date: Tue, 20 Sep 2022 13:00:14 +0400 Subject: [PATCH 2/4] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B4=D0=B2=D0=B8=D0=BD?= =?UTF-8?q?=D1=83=D1=82=D1=8B=D0=B9=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirBomber/AirBomber/DrawingAirBomber.cs | 23 +++++-- AirBomber/AirBomber/DrawingHeavyAirBomber.cs | 63 +++++++++++++++++++ AirBomber/AirBomber/EntityHeavyAirBomber.cs | 49 +++++++++++++++ AirBomber/AirBomber/FormAirBomber.Designer.cs | 13 ++++ AirBomber/AirBomber/FormAirBomber.cs | 28 +++++++++ 5 files changed, 172 insertions(+), 4 deletions(-) create mode 100644 AirBomber/AirBomber/DrawingHeavyAirBomber.cs create mode 100644 AirBomber/AirBomber/EntityHeavyAirBomber.cs diff --git a/AirBomber/AirBomber/DrawingAirBomber.cs b/AirBomber/AirBomber/DrawingAirBomber.cs index 74e8b6f..efa3cca 100644 --- a/AirBomber/AirBomber/DrawingAirBomber.cs +++ b/AirBomber/AirBomber/DrawingAirBomber.cs @@ -11,15 +11,15 @@ namespace AirBomber /// /// Класс-сущность /// - public EntityAirBomber AirBomber { private set; get; } + public EntityAirBomber AirBomber { protected set; get; } /// /// Левая координата отрисовки бомбардировщика /// - private float _startPosX; + protected float _startPosX; /// /// Верхняя кооридната отрисовки бомбардировщика /// - private float _startPosY; + protected float _startPosY; /// /// Ширина окна отрисовки /// @@ -47,6 +47,21 @@ namespace AirBomber AirBomber = new EntityAirBomber(speed, weight, bodyColor); } + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес бомбардировщика + /// Цвет корпуса + /// Ширина отрисовки бомбардировщика + /// Высота отрисовки бомбардировщика + protected DrawingAirBomber(int speed, float weight, Color bodyColor, int carWidth, int carHeight) : + this(speed, weight, bodyColor) + { + _airBomberWidth = carWidth; + _airBomberHeight = carHeight; + } + /// /// Установка позиции омбардировщика /// @@ -112,7 +127,7 @@ namespace AirBomber /// Отрисовка бомбардировщика /// /// - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue) diff --git a/AirBomber/AirBomber/DrawingHeavyAirBomber.cs b/AirBomber/AirBomber/DrawingHeavyAirBomber.cs new file mode 100644 index 0000000..0520f97 --- /dev/null +++ b/AirBomber/AirBomber/DrawingHeavyAirBomber.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirBomber +{ + internal class DrawingHeavyAirBomber : DrawingAirBomber + { + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес автомобиля + /// Цвет кузова + /// Дополнительный цвет + /// Признак наличия обвеса + /// Признак наличия антикрыла + /// Признак наличия гоночной полосы + public DrawingHeavyAirBomber(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) : + base(speed, weight, bodyColor, 110, 100) + { + AirBomber = new EntityHeavyAirBomber(speed, weight, bodyColor, dopColor, bodyKit, wing, sportLine); + } + public override void DrawTransport(Graphics g) + { + if (AirBomber is not EntityHeavyAirBomber heavyAirBomber) + { + return; + } + + Pen pen = new(Color.Black); + Brush dopBrush = new SolidBrush(heavyAirBomber.DopColor); + + if (heavyAirBomber.Bombs) + { + g.FillEllipse(dopBrush, _startPosX + 45, _startPosY, 20, 10); + g.FillEllipse(dopBrush, _startPosX + 45, _startPosY + 90, 20, 10); + g.DrawEllipse(pen, _startPosX + 45, _startPosY, 20, 10); + g.DrawEllipse(pen, _startPosX + 45, _startPosY + 90, 20, 10); + } + + base.DrawTransport(g); + + if (heavyAirBomber.TailLine) //TODO отрисовка полоски на хвосте + { + g.FillRectangle(dopBrush, _startPosX + 95, _startPosY + 30, 15, 5); + g.FillRectangle(dopBrush, _startPosX + 95, _startPosY + 65, 15, 5); + } + + if (heavyAirBomber.FuelTank) //TODO отрисовка топливных баков + { + g.FillEllipse(dopBrush, _startPosX + 23, _startPosY + 42, 25, 15); + g.FillEllipse(dopBrush, _startPosX + 53, _startPosY + 42, 25, 15); + g.FillEllipse(dopBrush, _startPosX + 83, _startPosY + 42, 25, 15); + g.DrawEllipse(pen, _startPosX + 23, _startPosY + 42, 25, 15); + g.DrawEllipse(pen, _startPosX + 53, _startPosY + 42, 25, 15); + g.DrawEllipse(pen, _startPosX + 83, _startPosY + 42, 25, 15); + } + } + } +} diff --git a/AirBomber/AirBomber/EntityHeavyAirBomber.cs b/AirBomber/AirBomber/EntityHeavyAirBomber.cs new file mode 100644 index 0000000..4f15db4 --- /dev/null +++ b/AirBomber/AirBomber/EntityHeavyAirBomber.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirBomber +{ + /// + /// Класс-сущность "Тяжелый бомбардировщик" + /// + internal class EntityHeavyAirBomber : EntityAirBomber + { + /// + /// Дополнительный цвет + /// + public Color DopColor { get; private set; } + /// + /// Признак наличия бомб + /// + public bool Bombs { get; private set; } + /// + /// Признак наличия топливных баков + /// + public bool FuelTank { get; private set; } + /// + /// Признак наличия полосы на хвосте + /// + public bool TailLine { get; private set; } + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес бомбардировщика + /// Цвет корпуса + /// Дополнительный цвет + /// Признак наличия обвеса + /// Признак наличия антикрыла + /// Признак наличия гоночной полосы + public EntityHeavyAirBomber(int speed, float weight, Color bodyColor, Color dopColor, bool bombs, bool fuelTank, bool tailLine) : + base(speed, weight, bodyColor) + { + DopColor = dopColor; + Bombs = bombs; + FuelTank = fuelTank; + TailLine = tailLine; + } + } +} diff --git a/AirBomber/AirBomber/FormAirBomber.Designer.cs b/AirBomber/AirBomber/FormAirBomber.Designer.cs index cac5394..d3661f3 100644 --- a/AirBomber/AirBomber/FormAirBomber.Designer.cs +++ b/AirBomber/AirBomber/FormAirBomber.Designer.cs @@ -38,6 +38,7 @@ this.buttonLeft = new System.Windows.Forms.Button(); this.buttonDown = new System.Windows.Forms.Button(); this.buttonRight = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirBomber)).BeginInit(); this.statusStrip1.SuspendLayout(); this.SuspendLayout(); @@ -143,11 +144,22 @@ this.buttonRight.UseVisualStyleBackColor = true; this.buttonRight.Click += new System.EventHandler(this.buttonMove_Click); // + // buttonCreateModif + // + this.buttonCreateModif.Location = new System.Drawing.Point(112, 395); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(120, 29); + this.buttonCreateModif.TabIndex = 7; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click); + // // FormAirBomber // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(882, 453); + this.Controls.Add(this.buttonCreateModif); this.Controls.Add(this.buttonCreateAirBomber); this.Controls.Add(this.buttonRight); this.Controls.Add(this.buttonDown); @@ -177,5 +189,6 @@ private Button buttonLeft; private Button buttonDown; private Button buttonRight; + private Button buttonCreateModif; } } \ No newline at end of file diff --git a/AirBomber/AirBomber/FormAirBomber.cs b/AirBomber/AirBomber/FormAirBomber.cs index 3f41ac3..968caa2 100644 --- a/AirBomber/AirBomber/FormAirBomber.cs +++ b/AirBomber/AirBomber/FormAirBomber.cs @@ -67,5 +67,33 @@ namespace AirBomber _airBomber?.ChangeBorders(pictureBoxAirBomber.Width, pictureBoxAirBomber.Height); Draw(); } + + /// + /// + /// + private void SetData() + { + Random rnd = new(); + _airBomber.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxAirBomber.Width, pictureBoxAirBomber.Height); + toolStripStatusLabelSpeed.Text = $": {_airBomber.AirBomber.Speed}"; + toolStripStatusLabelWeight.Text = $": {_airBomber.AirBomber.Weight}"; + toolStripStatusLabelBodyColor.Text = $": {_airBomber.AirBomber.BodyColor.Name}"; + } + + /// + /// "" + /// + /// + /// + private void buttonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + _airBomber = new DrawingHeavyAirBomber(rnd.Next(100, 300), rnd.Next(1000, 2000), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); + SetData(); + Draw(); + } } } \ No newline at end of file -- 2.25.1 From f423917695a078b28df88a038da303dabcfa467e Mon Sep 17 00:00:00 2001 From: Andrey_Abazov Date: Tue, 20 Sep 2022 13:12:20 +0400 Subject: [PATCH 3/4] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5?= =?UTF-8?q?=D0=B9=D1=81=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirBomber/AirBomber/DrawingAirBomber.cs | 9 +++++ AirBomber/AirBomber/DrawingObject.cs | 48 +++++++++++++++++++++++++ AirBomber/AirBomber/IDrawingObject.cs | 43 ++++++++++++++++++++++ 3 files changed, 100 insertions(+) create mode 100644 AirBomber/AirBomber/DrawingObject.cs create mode 100644 AirBomber/AirBomber/IDrawingObject.cs diff --git a/AirBomber/AirBomber/DrawingAirBomber.cs b/AirBomber/AirBomber/DrawingAirBomber.cs index efa3cca..6912c3d 100644 --- a/AirBomber/AirBomber/DrawingAirBomber.cs +++ b/AirBomber/AirBomber/DrawingAirBomber.cs @@ -222,5 +222,14 @@ namespace AirBomber _startPosY = _pictureHeight.Value - _airBomberHeight; } } + + /// + /// Получение текущей позиции объекта + /// + /// + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return (_startPosX, _startPosY, _startPosX + _airBomberWidth, _startPosY + _airBomberHeight); + } } } diff --git a/AirBomber/AirBomber/DrawingObject.cs b/AirBomber/AirBomber/DrawingObject.cs new file mode 100644 index 0000000..e086d63 --- /dev/null +++ b/AirBomber/AirBomber/DrawingObject.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirBomber +{ + internal class DrawingObject : IDrawingObject + { + private DrawingAirBomber _airBomber = null; + + public DrawingObject(DrawingAirBomber airBomber) + { + _airBomber = airBomber; + } + + public float Step => _airBomber?.AirBomber?.Step ?? 0; + + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return _airBomber?.GetCurrentPosition() ?? default; + } + + public void MoveObject(Direction direction) + { + _airBomber?.MoveTransport(direction); + } + + public void SetObject(int x, int y, int width, int height) + { + _airBomber.SetPosition(x, y, width, height); + } + + void IDrawingObject.DrawingObject(Graphics g) + { + if (_airBomber == null) return; + if (_airBomber is DrawingHeavyAirBomber heavyAirBomber) + { + heavyAirBomber.DrawTransport(g); + } + else + { + _airBomber.DrawTransport(g); + } + } + } +} diff --git a/AirBomber/AirBomber/IDrawingObject.cs b/AirBomber/AirBomber/IDrawingObject.cs new file mode 100644 index 0000000..804aaf2 --- /dev/null +++ b/AirBomber/AirBomber/IDrawingObject.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirBomber +{ + /// + /// Интерфейс для работы с объектом, прорисовываемым на форме + /// + internal interface IDrawingObject + { + /// + /// Шаг перемещения объекта + /// + public float Step { get; } + /// + /// Установка позиции объекта + /// + /// Координата X + /// Координата Y + /// Ширина полотна + /// Высота полотна + void SetObject(int x, int y, int width, int height); + /// + /// Изменение направления пермещения объекта + /// + /// Направление + /// + void MoveObject(Direction direction); + /// + /// Отрисовка объекта + /// + /// + void DrawingObject(Graphics g); + /// + /// Получение текущей позиции объекта + /// + /// + (float Left, float Right, float Top, float Bottom) GetCurrentPosition(); + } +} -- 2.25.1 From 9a2a95371a1fc38f290289dc0558b925dce96890 Mon Sep 17 00:00:00 2001 From: Andrey_Abazov Date: Tue, 4 Oct 2022 12:14:33 +0400 Subject: [PATCH 4/4] =?UTF-8?q?=D0=92=D1=82=D0=BE=D1=80=D0=B0=D1=8F=20?= =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0.=20=D0=90?= =?UTF-8?q?=D0=B1=D1=81=D1=82=D1=80=D0=B0=D0=BA=D1=82=D0=BD=D1=8B=D0=B9=20?= =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D1=81=D1=81,=20=D0=B8=D0=B7=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=BE=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirBomber/AirBomber/AbstractMap.cs | 117 ++++++++++ AirBomber/AirBomber/CityMap.cs | 76 +++++++ AirBomber/AirBomber/Direction.cs | 1 + AirBomber/AirBomber/DrawingAirBomber.cs | 2 +- ...ingObject.cs => DrawingObjectAirBomber.cs} | 6 +- AirBomber/AirBomber/FormMap.Designer.cs | 213 ++++++++++++++++++ AirBomber/AirBomber/FormMap.cs | 112 +++++++++ AirBomber/AirBomber/FormMap.resx | 66 ++++++ AirBomber/AirBomber/IDrawingObject.cs | 2 +- AirBomber/AirBomber/LineMap.cs | 96 ++++++++ AirBomber/AirBomber/Program.cs | 2 +- AirBomber/AirBomber/SimpleMap.cs | 54 +++++ 12 files changed, 741 insertions(+), 6 deletions(-) create mode 100644 AirBomber/AirBomber/AbstractMap.cs create mode 100644 AirBomber/AirBomber/CityMap.cs rename AirBomber/AirBomber/{DrawingObject.cs => DrawingObjectAirBomber.cs} (84%) create mode 100644 AirBomber/AirBomber/FormMap.Designer.cs create mode 100644 AirBomber/AirBomber/FormMap.cs create mode 100644 AirBomber/AirBomber/FormMap.resx create mode 100644 AirBomber/AirBomber/LineMap.cs create mode 100644 AirBomber/AirBomber/SimpleMap.cs diff --git a/AirBomber/AirBomber/AbstractMap.cs b/AirBomber/AirBomber/AbstractMap.cs new file mode 100644 index 0000000..02bd9a7 --- /dev/null +++ b/AirBomber/AirBomber/AbstractMap.cs @@ -0,0 +1,117 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirBomber +{ + internal abstract class AbstractMap + { + private IDrawingObject _drawningObject = null; + protected int[,] _map = null; + protected int _width; + protected int _height; + protected float _size_x; + protected float _size_y; + protected readonly Random _random = new(); + protected readonly int _freeRoad = 0; + protected readonly int _barrier = 1; + + public Bitmap CreateMap(int width, int height, IDrawingObject drawningObject) + { + _width = width; + _height = height; + _drawningObject = drawningObject; + GenerateMap(); + while (!SetObjectOnMap()) + { + GenerateMap(); + } + return DrawMapWithObject(); + } + public Bitmap MoveObject(Direction direction) + { + if (_drawningObject == null) return DrawMapWithObject(); + bool canMove = true; + switch (direction) + { + case Direction.Left: + if (!checkForBarriers(0, -1 * _drawningObject.Step, -1 * _drawningObject.Step, 0)) canMove = false; + break; + case Direction.Right: + if (!checkForBarriers(0, _drawningObject.Step, _drawningObject.Step, 0)) canMove = false; + break; + case Direction.Up: + if (!checkForBarriers(-1 * _drawningObject.Step, 0, 0, -1 * _drawningObject.Step)) canMove = false; + break; + case Direction.Down: + if (!checkForBarriers(_drawningObject.Step, 0, 0, _drawningObject.Step)) canMove = false; + break; + } + if (canMove) + { + _drawningObject.MoveObject(direction); + } + return DrawMapWithObject(); + } + private bool SetObjectOnMap() + { + if (_drawningObject == null || _map == null) + { + return false; + } + int x = _random.Next(0, 10); + int y = _random.Next(0, 10); + _drawningObject.SetObject(x, y, _width, _height); + if (!checkForBarriers(0,0,0,0)) return false; + return true; + } + private Bitmap DrawMapWithObject() + { + Bitmap bmp = new(_width, _height); + if (_drawningObject == null || _map == null) + { + return bmp; + } + Graphics gr = Graphics.FromImage(bmp); + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + if (_map[i, j] == _freeRoad) + { + DrawRoadPart(gr, i, j); + } + else if (_map[i, j] == _barrier) + { + DrawBarrierPart(gr, i, j); + } + } + } + _drawningObject.DrawingObject(gr); + return bmp; + } + + private bool checkForBarriers(float topOffset, float rightOffset, float leftOffset, float bottomOffset) + { + int top = Convert.ToInt32((_drawningObject.GetCurrentPosition().Top + topOffset) / _size_y); + int right = Convert.ToInt32((_drawningObject.GetCurrentPosition().Right + rightOffset) / _size_x); + int left = Convert.ToInt32((_drawningObject.GetCurrentPosition().Left + leftOffset) / _size_x); + int bottom = Convert.ToInt32((_drawningObject.GetCurrentPosition().Bottom + bottomOffset) / _size_y); + if (top < 0 || left < 0 || right >= _map.GetLength(1) || bottom >= _map.GetLength(0)) return false; + for (int i = top; i <= bottom; i++) + { + for (int j = left; j <= right; j++) + { + if (_map[j, i] == 1) return false; + } + } + return true; + } + + protected abstract void GenerateMap(); + protected abstract void DrawRoadPart(Graphics g, int i, int j); + protected abstract void DrawBarrierPart(Graphics g, int i, int j); + } +} diff --git a/AirBomber/AirBomber/CityMap.cs b/AirBomber/AirBomber/CityMap.cs new file mode 100644 index 0000000..f3d08a5 --- /dev/null +++ b/AirBomber/AirBomber/CityMap.cs @@ -0,0 +1,76 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirBomber +{ + internal class CityMap : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Brush barrierColor = new SolidBrush(Color.Gray); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.LightBlue); + + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y); + } + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y); + } + protected override void GenerateMap() + { + _map = new int[100, 100]; + _size_x = (float)_width / _map.GetLength(0); + _size_y = (float)_height / _map.GetLength(1); + int buildingCounter = 0; + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + _map[i, j] = _freeRoad; + } + } + while (buildingCounter < 10) + { + int x = _random.Next(0, 89); + int y = _random.Next(0, 89); + int buildingWidth = _random.Next(2, 10); + int buildingHeight = _random.Next(2, 10); + if (x + buildingWidth >= _map.GetLength(0)) x = _random.Next(_map.GetLength(0) - buildingWidth - 1, _map.GetLength(0)); + if (y + buildingHeight >= _map.GetLength(1)) y = _random.Next(_map.GetLength(1) - buildingHeight - 1, _map.GetLength(1)); + + bool isFreeSpace = true; + for (int i = x; i < x + buildingWidth; i++) + { + for (int j = y; j < y + buildingHeight; j++) + { + if (_map[i, j] != _freeRoad) + { + isFreeSpace = false; + break; + } + } + } + if (isFreeSpace) + { + for (int i = x; i < x + buildingWidth; i++) + { + for (int j = y; j < y + buildingHeight; j++) + { + _map[i, j] = _barrier; + } + } + buildingCounter++; + } + } + } + } +} diff --git a/AirBomber/AirBomber/Direction.cs b/AirBomber/AirBomber/Direction.cs index 457f940..ebe762f 100644 --- a/AirBomber/AirBomber/Direction.cs +++ b/AirBomber/AirBomber/Direction.cs @@ -11,6 +11,7 @@ namespace AirBomber /// internal enum Direction { + None = 0, Up = 1, Down = 2, Left = 3, diff --git a/AirBomber/AirBomber/DrawingAirBomber.cs b/AirBomber/AirBomber/DrawingAirBomber.cs index 6912c3d..9f08256 100644 --- a/AirBomber/AirBomber/DrawingAirBomber.cs +++ b/AirBomber/AirBomber/DrawingAirBomber.cs @@ -227,7 +227,7 @@ namespace AirBomber /// Получение текущей позиции объекта /// /// - public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + public (float Left, float Top, float Right, float Bottom) GetCurrentPosition() { return (_startPosX, _startPosY, _startPosX + _airBomberWidth, _startPosY + _airBomberHeight); } diff --git a/AirBomber/AirBomber/DrawingObject.cs b/AirBomber/AirBomber/DrawingObjectAirBomber.cs similarity index 84% rename from AirBomber/AirBomber/DrawingObject.cs rename to AirBomber/AirBomber/DrawingObjectAirBomber.cs index e086d63..44d3809 100644 --- a/AirBomber/AirBomber/DrawingObject.cs +++ b/AirBomber/AirBomber/DrawingObjectAirBomber.cs @@ -6,18 +6,18 @@ using System.Threading.Tasks; namespace AirBomber { - internal class DrawingObject : IDrawingObject + internal class DrawingObjectAirBomber : IDrawingObject { private DrawingAirBomber _airBomber = null; - public DrawingObject(DrawingAirBomber airBomber) + public DrawingObjectAirBomber(DrawingAirBomber airBomber) { _airBomber = airBomber; } public float Step => _airBomber?.AirBomber?.Step ?? 0; - public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + public (float Left, float Top, float Right, float Bottom) GetCurrentPosition() { return _airBomber?.GetCurrentPosition() ?? default; } diff --git a/AirBomber/AirBomber/FormMap.Designer.cs b/AirBomber/AirBomber/FormMap.Designer.cs new file mode 100644 index 0000000..b77cd4f --- /dev/null +++ b/AirBomber/AirBomber/FormMap.Designer.cs @@ -0,0 +1,213 @@ +namespace AirBomber +{ + partial class FormMap + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.pictureBoxAirBomber = new System.Windows.Forms.PictureBox(); + this.buttonCreateAirBomber = new System.Windows.Forms.Button(); + this.buttonUp = new System.Windows.Forms.Button(); + this.buttonLeft = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonRight = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); + this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel(); + this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirBomber)).BeginInit(); + this.statusStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // pictureBoxAirBomber + // + this.pictureBoxAirBomber.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBoxAirBomber.Location = new System.Drawing.Point(0, 0); + this.pictureBoxAirBomber.Name = "pictureBoxAirBomber"; + this.pictureBoxAirBomber.Size = new System.Drawing.Size(882, 427); + this.pictureBoxAirBomber.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBoxAirBomber.TabIndex = 0; + this.pictureBoxAirBomber.TabStop = false; + // + // buttonCreateAirBomber + // + this.buttonCreateAirBomber.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreateAirBomber.Location = new System.Drawing.Point(12, 395); + this.buttonCreateAirBomber.Name = "buttonCreateAirBomber"; + this.buttonCreateAirBomber.Size = new System.Drawing.Size(94, 29); + this.buttonCreateAirBomber.TabIndex = 2; + this.buttonCreateAirBomber.Text = "Создать"; + this.buttonCreateAirBomber.UseVisualStyleBackColor = true; + this.buttonCreateAirBomber.Click += new System.EventHandler(this.ButtonCreate_Click); + // + // buttonUp + // + this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonUp.BackgroundImage = global::AirBomber.Properties.Resources.arrowUp; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(804, 358); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(30, 30); + this.buttonUp.TabIndex = 3; + this.buttonUp.UseVisualStyleBackColor = true; + this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonLeft + // + this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonLeft.BackgroundImage = global::AirBomber.Properties.Resources.arrowLeft; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(768, 394); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(30, 30); + this.buttonLeft.TabIndex = 4; + this.buttonLeft.UseVisualStyleBackColor = true; + this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonDown + // + this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonDown.BackgroundImage = global::AirBomber.Properties.Resources.arrowDown; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(804, 394); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(30, 30); + this.buttonDown.TabIndex = 5; + this.buttonDown.UseVisualStyleBackColor = true; + this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonRight + // + this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRight.BackgroundImage = global::AirBomber.Properties.Resources.arrowRight; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(840, 394); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(30, 30); + this.buttonRight.TabIndex = 6; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonCreateModif + // + this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreateModif.Location = new System.Drawing.Point(112, 395); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(120, 29); + this.buttonCreateModif.TabIndex = 7; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); + // + // statusStrip1 + // + this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabelBodyColor}); + this.statusStrip1.Location = new System.Drawing.Point(0, 427); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(882, 26); + this.statusStrip1.TabIndex = 8; + this.statusStrip1.Text = "statusStripInfo"; + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(76, 20); + this.toolStripStatusLabelSpeed.Text = "Скорость:"; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(36, 20); + this.toolStripStatusLabelWeight.Text = "Вес:"; + // + // toolStripStatusLabelBodyColor + // + this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(45, 20); + this.toolStripStatusLabelBodyColor.Text = "Цвет:"; + // + // comboBoxSelectorMap + // + this.comboBoxSelectorMap.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxSelectorMap.FormattingEnabled = true; + this.comboBoxSelectorMap.Items.AddRange(new object[] { + "Простая карта", + "Городская карта", + "Линейная карта"}); + this.comboBoxSelectorMap.Location = new System.Drawing.Point(238, 394); + this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; + this.comboBoxSelectorMap.Size = new System.Drawing.Size(151, 28); + this.comboBoxSelectorMap.TabIndex = 9; + this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); + // + // FormMap + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(882, 453); + this.Controls.Add(this.comboBoxSelectorMap); + this.Controls.Add(this.buttonCreateModif); + this.Controls.Add(this.buttonCreateAirBomber); + this.Controls.Add(this.buttonRight); + this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonLeft); + this.Controls.Add(this.buttonUp); + this.Controls.Add(this.pictureBoxAirBomber); + this.Controls.Add(this.statusStrip1); + this.Name = "FormMap"; + this.Text = "Карта"; + this.Load += new System.EventHandler(this.FormMap_Load); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirBomber)).EndInit(); + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private PictureBox pictureBoxAirBomber; + private Button buttonCreateAirBomber; + private Button buttonUp; + private Button buttonLeft; + private Button buttonDown; + private Button buttonRight; + private Button buttonCreateModif; + private StatusStrip statusStrip1; + private ToolStripStatusLabel toolStripStatusLabelSpeed; + private ToolStripStatusLabel toolStripStatusLabelWeight; + private ToolStripStatusLabel toolStripStatusLabelBodyColor; + private ComboBox comboBoxSelectorMap; + } +} \ No newline at end of file diff --git a/AirBomber/AirBomber/FormMap.cs b/AirBomber/AirBomber/FormMap.cs new file mode 100644 index 0000000..19ca30f --- /dev/null +++ b/AirBomber/AirBomber/FormMap.cs @@ -0,0 +1,112 @@ +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 FormMap : Form + { + private AbstractMap _abstractMap; + + public FormMap() + { + InitializeComponent(); + _abstractMap = new SimpleMap(); + } + /// + /// Заполнение информации по объекту + /// + /// + private void SetData(DrawingAirBomber airBomber) + { + toolStripStatusLabelSpeed.Text = $"Скорость: {airBomber.AirBomber.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {airBomber.AirBomber.Weight}"; + toolStripStatusLabelBodyColor.Text = $"Цвет: {airBomber.AirBomber.BodyColor.Name}"; + pictureBoxAirBomber.Image = _abstractMap.CreateMap(pictureBoxAirBomber.Width, pictureBoxAirBomber.Height, + new DrawingObjectAirBomber(airBomber)); + } + /// + /// Обработка нажатия кнопки "Создать" + /// + /// + /// + private void ButtonCreate_Click(object sender, EventArgs e) + { + Random rnd = new(); + var airBomber = new DrawingAirBomber(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + SetData(airBomber); + } + /// + /// Изменение размеров формы + /// + /// + /// + private void ButtonMove_Click(object sender, EventArgs e) + { + //получаем имя кнопки + string name = ((Button)sender)?.Name ?? string.Empty; + Direction dir = Direction.None; + switch (name) + { + case "buttonUp": + dir = Direction.Up; + break; + case "buttonDown": + dir = Direction.Down; + break; + case "buttonLeft": + dir = Direction.Left; + break; + case "buttonRight": + dir = Direction.Right; + break; + } + pictureBoxAirBomber.Image = _abstractMap?.MoveObject(dir); + } + /// + /// Обработка нажатия кнопки "Модификация" + /// + /// + /// + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + var airBomber = new DrawingHeavyAirBomber(rnd.Next(100, 300), rnd.Next(1000, 2000), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); + SetData(airBomber); + } + /// + /// Смена карты + /// + /// + /// + private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxSelectorMap.Text) + { + case "Простая карта": + _abstractMap = new SimpleMap(); + break; + case "Городская карта": + _abstractMap = new CityMap(); + break; + case "Линейная карта": + _abstractMap = new LineMap(); + break; + } + } + + private void FormMap_Load(object sender, EventArgs e) + { + comboBoxSelectorMap.SelectedIndex = 0; + } + } +} diff --git a/AirBomber/AirBomber/FormMap.resx b/AirBomber/AirBomber/FormMap.resx new file mode 100644 index 0000000..d930a64 --- /dev/null +++ b/AirBomber/AirBomber/FormMap.resx @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + 46 + + \ No newline at end of file diff --git a/AirBomber/AirBomber/IDrawingObject.cs b/AirBomber/AirBomber/IDrawingObject.cs index 804aaf2..6f8a68a 100644 --- a/AirBomber/AirBomber/IDrawingObject.cs +++ b/AirBomber/AirBomber/IDrawingObject.cs @@ -38,6 +38,6 @@ namespace AirBomber /// Получение текущей позиции объекта /// /// - (float Left, float Right, float Top, float Bottom) GetCurrentPosition(); + (float Left, float Top, float Right, float Bottom) GetCurrentPosition(); } } diff --git a/AirBomber/AirBomber/LineMap.cs b/AirBomber/AirBomber/LineMap.cs new file mode 100644 index 0000000..0410aa6 --- /dev/null +++ b/AirBomber/AirBomber/LineMap.cs @@ -0,0 +1,96 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirBomber +{ + internal class LineMap : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Brush barrierColor = new SolidBrush(Color.Black); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.Aquamarine); + + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y); + } + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y); + } + protected override void GenerateMap() + { + _map = new int[100, 100]; + _size_x = (float)_width / _map.GetLength(0); + _size_y = (float)_height / _map.GetLength(1); + int lineCounter = 0; + int numOfLines = _random.Next(1, 4); + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + _map[i, j] = _freeRoad; + } + } + while (lineCounter < numOfLines) + { + int randomInt = _random.Next(0, 1000); + bool vertical = false; + if (randomInt % 2 == 0) vertical = true; + if (vertical) + { + int x = _random.Next(0, 89); + int lineWidth = _random.Next(2, 5); + if (x + lineWidth >= _map.GetLength(0)) x = _random.Next(_map.GetLength(0) - lineWidth - 1, _map.GetLength(0)); + + bool isFreeSpace = true; + for (int i = x; i < x + lineWidth; i++) + { + if (_map[i, 0] != _freeRoad) isFreeSpace = false; + } + if (isFreeSpace) + { + for (int i = x; i < x + lineWidth; i++) + { + for (int j = 0; j < _map.GetLength(0); j++) + { + _map[i, j] = _barrier; + } + } + lineCounter++; + } + } + else + { + int y = _random.Next(0, 89); + int lineHeigth = _random.Next(2, 5); + if (y + lineHeigth >= _map.GetLength(1)) y = _random.Next(_map.GetLength(1) - lineHeigth - 1, _map.GetLength(1)); + + bool isFreeSpace = true; + for (int j = y; j < y + lineHeigth; j++) + { + if (_map[0, j] != _freeRoad) isFreeSpace = false; + } + if (isFreeSpace) + { + for (int j = y; j < y + lineHeigth; j++) + { + for (int i = 0; i < _map.GetLength(1); i++) + { + _map[i, j] = _barrier; + } + } + lineCounter++; + } + } + } + } + } +} diff --git a/AirBomber/AirBomber/Program.cs b/AirBomber/AirBomber/Program.cs index 76b85fe..e462fb5 100644 --- a/AirBomber/AirBomber/Program.cs +++ b/AirBomber/AirBomber/Program.cs @@ -11,7 +11,7 @@ namespace AirBomber // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormAirBomber()); + Application.Run(new FormMap()); } } } \ No newline at end of file diff --git a/AirBomber/AirBomber/SimpleMap.cs b/AirBomber/AirBomber/SimpleMap.cs new file mode 100644 index 0000000..656c195 --- /dev/null +++ b/AirBomber/AirBomber/SimpleMap.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace AirBomber +{ + internal class SimpleMap : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Brush barrierColor = new SolidBrush(Color.Black); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.Gray); + + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y); + } + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y); + } + protected override void GenerateMap() + { + _map = new int[100, 100]; + _size_x = (float)_width / _map.GetLength(0); + _size_y = (float)_height / _map.GetLength(1); + int counter = 0; + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + _map[i, j] = _freeRoad; + } + } + while (counter < 50) + { + int x = _random.Next(0, 100); + int y = _random.Next(0, 100); + if (_map[x, y] == _freeRoad) + { + _map[x, y] = _barrier; + counter++; + } + } + } + } +} -- 2.25.1