From 91d21e30812de0a8d30c191278e9449583e1d3bf Mon Sep 17 00:00:00 2001 From: Danil Kargin Date: Wed, 5 Oct 2022 22:53:56 +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 --- AirFighter/AirFighter/DrawningAirFighter.cs | 5 ++--- AirFighter/AirFighter/EntityAirFighter.cs | 2 +- AirFighter/AirFighter/FormAirFighter.cs | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/AirFighter/AirFighter/DrawningAirFighter.cs b/AirFighter/AirFighter/DrawningAirFighter.cs index 839168c..edba9d3 100644 --- a/AirFighter/AirFighter/DrawningAirFighter.cs +++ b/AirFighter/AirFighter/DrawningAirFighter.cs @@ -45,10 +45,9 @@ namespace AirFighter /// Скорость /// Вес самолета /// Цвет кузова - public void Init(int speed, float weight, Color bodyColor) + public DrawningAirFighter(int speed, float weight, Color bodyColor) { - AirFighter = new EntityAirFighter(); - AirFighter.Init(speed, weight, bodyColor); + AirFighter = new EntityAirFighter(speed, weight, bodyColor); } /// /// Установка позиции самолета diff --git a/AirFighter/AirFighter/EntityAirFighter.cs b/AirFighter/AirFighter/EntityAirFighter.cs index 9a2262c..0aa3e36 100644 --- a/AirFighter/AirFighter/EntityAirFighter.cs +++ b/AirFighter/AirFighter/EntityAirFighter.cs @@ -34,7 +34,7 @@ namespace AirFighter /// /// /// - public void Init(int speed, float weight, Color bodyColor) + public EntityAirFighter(int speed, float weight, Color bodyColor) { Random rnd = new(); Speed = speed <= 0 ? rnd.Next(50, 150) : speed; diff --git a/AirFighter/AirFighter/FormAirFighter.cs b/AirFighter/AirFighter/FormAirFighter.cs index 111abdd..f5dc5f1 100644 --- a/AirFighter/AirFighter/FormAirFighter.cs +++ b/AirFighter/AirFighter/FormAirFighter.cs @@ -24,9 +24,8 @@ namespace AirFighter /// private void ButtonCreate_Click(object sender, EventArgs e) { - _airFighter = new DrawningAirFighter(); Random rnd = new Random(); - _airFighter.Init(rnd.Next(200, 500), rnd.Next(2000, 5000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + _airFighter = new DrawningAirFighter(rnd.Next(200, 500), rnd.Next(2000, 5000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); _airFighter.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxAirFighter.Width, pictureBoxAirFighter.Height); toolStripStatusLabelSpeed.Text = $": {_airFighter.AirFighter?.Speed}"; toolStripStatusLabelWeight.Text = $": {_airFighter.AirFighter?.Weight}"; -- 2.25.1 From 41000f3cc55ac544fc6180538a734f5aadca2145 Mon Sep 17 00:00:00 2001 From: Danil Kargin Date: Wed, 5 Oct 2022 23:14:01 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirFighter/AirFighter/DrawningAirFighter.cs | 14 ++- .../AirFighter/DrawningUpgradeAirFighter.cs | 99 +++++++++++++++++++ .../AirFighter/EntityUpgradeAirFighter.cs | 43 ++++++++ .../AirFighter/FormAirFighter.Designer.cs | 14 +++ AirFighter/AirFighter/FormAirFighter.cs | 29 +++++- 5 files changed, 191 insertions(+), 8 deletions(-) create mode 100644 AirFighter/AirFighter/DrawningUpgradeAirFighter.cs create mode 100644 AirFighter/AirFighter/EntityUpgradeAirFighter.cs diff --git a/AirFighter/AirFighter/DrawningAirFighter.cs b/AirFighter/AirFighter/DrawningAirFighter.cs index edba9d3..f42f2e4 100644 --- a/AirFighter/AirFighter/DrawningAirFighter.cs +++ b/AirFighter/AirFighter/DrawningAirFighter.cs @@ -14,15 +14,15 @@ namespace AirFighter /// /// Класс-сущность /// - public EntityAirFighter AirFighter { private set; get; } + public EntityAirFighter AirFighter { protected set; get; } /// /// Левая координата отрисовки самолета /// - private float _startPosX; + protected float _startPosX; /// /// Верхняя кооридната отрисовки самолета /// - private float _startPosY; + protected float _startPosY; /// /// Ширина окна отрисовки /// @@ -49,6 +49,12 @@ namespace AirFighter { AirFighter = new EntityAirFighter(speed, weight, bodyColor); } + protected DrawningAirFighter(int speed, float weight, Color bodyColor, int airFighterWight, int airFighterHeight) : + this(speed, weight, bodyColor) + { + _airFighterWidth = airFighterWight; + _airFighterHeight = airFighterHeight; + } /// /// Установка позиции самолета /// @@ -123,7 +129,7 @@ namespace AirFighter /// /// Отрисовка самолета /// - public void DrawAirFighter(Graphics g) + public virtual void DrawAirFighter(Graphics g) { if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue) { diff --git a/AirFighter/AirFighter/DrawningUpgradeAirFighter.cs b/AirFighter/AirFighter/DrawningUpgradeAirFighter.cs new file mode 100644 index 0000000..de85e9b --- /dev/null +++ b/AirFighter/AirFighter/DrawningUpgradeAirFighter.cs @@ -0,0 +1,99 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirFighter +{ + internal class DrawningUpgradeAirFighter : DrawningAirFighter + { + /// + /// Инициализация свойств + /// + /// + /// + /// + /// + /// + /// + public DrawningUpgradeAirFighter(int speed, float weight, Color bodyColor, Color dopColor, bool dopWing, bool rocket) : + base(speed, weight, bodyColor, 85, 80) + { + AirFighter = new EntityUpgradeAirFighter(speed, weight, bodyColor, dopColor, dopWing, rocket); + } + public override void DrawAirFighter(Graphics g) + { + if(AirFighter is not EntityUpgradeAirFighter upgradeAirFighter) + { + return; + } + + Pen pen = new(Color.Black); + Brush dopBrush = new SolidBrush(upgradeAirFighter.DopColor); + + _startPosX += 5; + _startPosY += 5; + base.DrawAirFighter(g); + _startPosX -= 5; + _startPosY -= 5; + + if (upgradeAirFighter.DopWing) + { + PointF[] _pointBackWing = + { + new PointF(_startPosX, _startPosY + 35), + new PointF(_startPosX, _startPosY + 45), + new PointF(_startPosX + 10, _startPosY + 40) + }; + PointF[] _pointLeftWing = + { + new PointF(_startPosX + 50, _startPosY + 35), + new PointF(_startPosX + 55, _startPosY + 30), + new PointF(_startPosX + 65, _startPosY + 35) + }; + PointF[] _pointRightWing = + { + new PointF(_startPosX + 50, _startPosY + 45), + new PointF(_startPosX + 55, _startPosY + 50), + new PointF(_startPosX + 65, _startPosY + 45) + }; + + g.FillPolygon(dopBrush, _pointBackWing); + g.FillPolygon(dopBrush, _pointLeftWing); + g.FillPolygon(dopBrush, _pointRightWing); + + g.DrawPolygon(pen, _pointBackWing); + g.DrawPolygon(pen, _pointLeftWing); + g.DrawPolygon(pen, _pointRightWing); + } + + if (upgradeAirFighter.Rocket) + { + PointF[] _pointLeftRocket = + { + new PointF(_startPosX + 35, _startPosY), + new PointF(_startPosX + 45, _startPosY), + new PointF(_startPosX + 50, _startPosY + 3), + new PointF(_startPosX + 45, _startPosY + 5), + new PointF(_startPosX + 35, _startPosY + 5) + }; + PointF[] _pointRightRocket = + { + new PointF(_startPosX + 35, _startPosY + 75), + new PointF(_startPosX + 45, _startPosY + 75), + new PointF(_startPosX + 50, _startPosY + 77), + new PointF(_startPosX + 45, _startPosY + 80), + new PointF(_startPosX + 35, _startPosY + 80) + }; + + g.FillPolygon(dopBrush, _pointLeftRocket); + g.FillPolygon(dopBrush, _pointRightRocket); + + g.DrawPolygon(pen, _pointLeftRocket); + g.DrawPolygon(pen, _pointRightRocket); + } + + } + } +} diff --git a/AirFighter/AirFighter/EntityUpgradeAirFighter.cs b/AirFighter/AirFighter/EntityUpgradeAirFighter.cs new file mode 100644 index 0000000..70f80cb --- /dev/null +++ b/AirFighter/AirFighter/EntityUpgradeAirFighter.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirFighter +{ + /// + /// Класс-сущность самолет разведчик + /// + internal class EntityUpgradeAirFighter : EntityAirFighter + { + /// + /// Дополнительный цвет + /// + public Color DopColor { get; private set; } + /// + /// Признак наличия дополнительных крыльев + /// + public bool DopWing { get; private set; } + /// + /// Признак наличия ракет + /// + public bool Rocket { get; private set; } + /// + /// Инициализация свойств + /// + /// + /// + /// + /// + /// + /// + public EntityUpgradeAirFighter(int speed, float weight, Color bodyColor, Color dopColor, bool dopWing, bool rocket) : + base(speed,weight,bodyColor) + { + DopColor = dopColor; + DopWing = dopWing; + Rocket = rocket; + } + } +} diff --git a/AirFighter/AirFighter/FormAirFighter.Designer.cs b/AirFighter/AirFighter/FormAirFighter.Designer.cs index fbca490..b5e7eda 100644 --- a/AirFighter/AirFighter/FormAirFighter.Designer.cs +++ b/AirFighter/AirFighter/FormAirFighter.Designer.cs @@ -38,6 +38,7 @@ this.buttonDown = new System.Windows.Forms.Button(); this.buttonLeft = new System.Windows.Forms.Button(); this.buttonRight = new System.Windows.Forms.Button(); + this.buttonUpgrade = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirFighter)).BeginInit(); this.statusStrip.SuspendLayout(); this.SuspendLayout(); @@ -142,11 +143,23 @@ this.buttonRight.UseVisualStyleBackColor = true; this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); // + // buttonUpgrade + // + this.buttonUpgrade.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonUpgrade.Location = new System.Drawing.Point(148, 379); + this.buttonUpgrade.Name = "buttonUpgrade"; + this.buttonUpgrade.Size = new System.Drawing.Size(127, 29); + this.buttonUpgrade.TabIndex = 7; + this.buttonUpgrade.Text = "Модификация"; + this.buttonUpgrade.UseVisualStyleBackColor = true; + this.buttonUpgrade.Click += new System.EventHandler(this.ButtonUpgrade_Click); + // // FormAirFighter // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.buttonUpgrade); this.Controls.Add(this.buttonRight); this.Controls.Add(this.buttonLeft); this.Controls.Add(this.buttonDown); @@ -176,5 +189,6 @@ private Button buttonDown; private Button buttonLeft; private Button buttonRight; + private Button buttonUpgrade; } } \ No newline at end of file diff --git a/AirFighter/AirFighter/FormAirFighter.cs b/AirFighter/AirFighter/FormAirFighter.cs index f5dc5f1..60b932e 100644 --- a/AirFighter/AirFighter/FormAirFighter.cs +++ b/AirFighter/AirFighter/FormAirFighter.cs @@ -18,6 +18,17 @@ namespace AirFighter pictureBoxAirFighter.Image = bmp; } /// + /// + /// + private void SetData() + { + Random rnd = new Random(); + _airFighter.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxAirFighter.Width, pictureBoxAirFighter.Height); + toolStripStatusLabelSpeed.Text = $": {_airFighter.AirFighter?.Speed}"; + toolStripStatusLabelWeight.Text = $": {_airFighter.AirFighter?.Weight}"; + toolStripStatusLabelBodyColor.Text = $": {_airFighter.AirFighter?.BodyColor}"; + } + /// /// "" /// /// @@ -26,10 +37,7 @@ namespace AirFighter { Random rnd = new Random(); _airFighter = new DrawningAirFighter(rnd.Next(200, 500), rnd.Next(2000, 5000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); - _airFighter.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxAirFighter.Width, pictureBoxAirFighter.Height); - toolStripStatusLabelSpeed.Text = $": {_airFighter.AirFighter?.Speed}"; - toolStripStatusLabelWeight.Text = $": {_airFighter.AirFighter?.Weight}"; - toolStripStatusLabelBodyColor.Text = $": {_airFighter.AirFighter?.BodyColor}"; + SetData(); Draw(); } /// @@ -67,5 +75,18 @@ namespace AirFighter _airFighter?.ChangeBorders(pictureBoxAirFighter.Width, pictureBoxAirFighter.Height); Draw(); } + /// + /// "" + /// + /// + /// + private void ButtonUpgrade_Click(object sender, EventArgs e) + { + Random rnd = new(); + _airFighter = new DrawningUpgradeAirFighter(rnd.Next(300, 600), rnd.Next(2000, 5000), 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))); + SetData(); + Draw(); + } } } \ No newline at end of file -- 2.25.1 From 7a919fc4d0a4a92c70f4a3185e43c86ba465471d Mon Sep 17 00:00:00 2001 From: Danil Kargin Date: Wed, 5 Oct 2022 23:19:25 +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 --- AirFighter/AirFighter/DrawningAirFighter.cs | 8 ++++ .../AirFighter/DrawningObjectAirFighter.cs | 38 ++++++++++++++++ AirFighter/AirFighter/IDrawningObject.cs | 44 +++++++++++++++++++ 3 files changed, 90 insertions(+) create mode 100644 AirFighter/AirFighter/DrawningObjectAirFighter.cs create mode 100644 AirFighter/AirFighter/IDrawningObject.cs diff --git a/AirFighter/AirFighter/DrawningAirFighter.cs b/AirFighter/AirFighter/DrawningAirFighter.cs index f42f2e4..12f3ab9 100644 --- a/AirFighter/AirFighter/DrawningAirFighter.cs +++ b/AirFighter/AirFighter/DrawningAirFighter.cs @@ -188,5 +188,13 @@ namespace AirFighter _startPosY = _pictureHeight.Value - _airFighterHeight; } } + /// + /// Получение текущей позиции объекта + /// + /// + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return (_startPosX, _startPosX + _airFighterWidth, _startPosY, _startPosY + _airFighterHeight); + } } } diff --git a/AirFighter/AirFighter/DrawningObjectAirFighter.cs b/AirFighter/AirFighter/DrawningObjectAirFighter.cs new file mode 100644 index 0000000..3e5f997 --- /dev/null +++ b/AirFighter/AirFighter/DrawningObjectAirFighter.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirFighter +{ + internal class DrawningObjectAirFighter : IDrawningObject + { + private DrawningAirFighter _airFighter = null; + public float Step => _airFighter?.AirFighter.Step ?? 0; + public DrawningObjectAirFighter(DrawningAirFighter airFighter) + { + _airFighter = airFighter; + } + + void IDrawningObject.DrawningObject(Graphics g) + { + _airFighter.DrawAirFighter(g); + } + + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return _airFighter?.GetCurrentPosition() ?? default; + } + + public void MoveObject(Direction direction) + { + _airFighter?.MoveTransport(direction); + } + + public void SetObject(int x, int y, int width, int height) + { + _airFighter?.SetPosition(x, y, width, height); + } + } +} diff --git a/AirFighter/AirFighter/IDrawningObject.cs b/AirFighter/AirFighter/IDrawningObject.cs new file mode 100644 index 0000000..8f8230b --- /dev/null +++ b/AirFighter/AirFighter/IDrawningObject.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirFighter +{ + /// + /// Интерфейс для работы с объектом, прорисовываемым на форме + /// + internal interface IDrawningObject + { + /// + /// Шаг перемещения объекта + /// + public float Step { get; } + /// + /// Установка позиции объекта + /// + /// Координата X + /// Координата Y + /// Ширина полотна + /// Высота полотна + void SetObject(int x, int y, int width, int height); + /// + /// Изменение направления пермещения объекта + /// + /// Направление + void MoveObject(Direction direction); + /// + /// Отрисовка объекта + /// + /// + void DrawningObject(Graphics g); + /// + /// Получение текущей позиции объекта + /// + /// + (float Left, float Right, float Top, float Bottom) + GetCurrentPosition(); + + } +} -- 2.25.1 From d3f412720de1b5ca562a08b732caa70a0e091337 Mon Sep 17 00:00:00 2001 From: Danil Kargin Date: Wed, 5 Oct 2022 23:39:53 +0400 Subject: [PATCH 4/4] =?UTF-8?q?=D0=90=D0=B1=D1=81=D1=82=D1=80=D0=B0=D0=BA?= =?UTF-8?q?=D1=82=D0=BD=D1=8B=D0=B9=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirFighter/AirFighter/AbstractMap.cs | 157 ++++++++++++++++ AirFighter/AirFighter/Direction.cs | 1 + AirFighter/AirFighter/FormMap.Designer.cs | 209 ++++++++++++++++++++++ AirFighter/AirFighter/FormMap.cs | 103 +++++++++++ AirFighter/AirFighter/FormMap.resx | 63 +++++++ AirFighter/AirFighter/Program.cs | 2 +- AirFighter/AirFighter/SimpleMap.cs | 53 ++++++ AirFighter/AirFighter/StormMap.cs | 66 +++++++ 8 files changed, 653 insertions(+), 1 deletion(-) create mode 100644 AirFighter/AirFighter/AbstractMap.cs create mode 100644 AirFighter/AirFighter/FormMap.Designer.cs create mode 100644 AirFighter/AirFighter/FormMap.cs create mode 100644 AirFighter/AirFighter/FormMap.resx create mode 100644 AirFighter/AirFighter/SimpleMap.cs create mode 100644 AirFighter/AirFighter/StormMap.cs diff --git a/AirFighter/AirFighter/AbstractMap.cs b/AirFighter/AirFighter/AbstractMap.cs new file mode 100644 index 0000000..2c61fba --- /dev/null +++ b/AirFighter/AirFighter/AbstractMap.cs @@ -0,0 +1,157 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirFighter +{ + internal abstract class AbstractMap + { + private IDrawningObject _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, IDrawningObject + drawningObject) + { + _width = width; + _height = height; + _drawningObject = drawningObject; + GenerateMap(); + while (!SetObjectOnMap()) + { + GenerateMap(); + } + return DrawMapWithObject(); + } + public Bitmap MoveObject(Direction direction) + { + // Проверка коллизии + (float Left, float Right, float Top, float Bottom) = _drawningObject.GetCurrentPosition(); + + switch (direction) + { + case Direction.Right: + if (Right + _drawningObject.Step < _width) + { + Left += _drawningObject.Step; + Right += _drawningObject.Step; + } + break; + case Direction.Left: + if (Left - _drawningObject.Step >= 0) + { + Left -= _drawningObject.Step; + Right -= _drawningObject.Step; + } + break; + case Direction.Up: + if (Top - _drawningObject.Step >= 0) + { + Top -= _drawningObject.Step; + Bottom -= _drawningObject.Step; + } + break; + case Direction.Down: + if (Bottom + _drawningObject.Step < _height) + { + Top += _drawningObject.Step; + Bottom += _drawningObject.Step; + } + break; + } + if (CheckBarrier((int)Right, (int)Left, (int)Top, (int)Bottom) == 1) + { + _drawningObject.MoveObject(direction); + } + return DrawMapWithObject(); + } + private int CheckBarrier(int Right, int Left, int Top, int Bottom) + { + if(Left < 0 || Top < 0 || Right > _width || Bottom > _height) + { + return 2; + } + for (int i = (int)(Top / _size_y); i <= (int)(Bottom / _size_y) + 1; i++) + { + for (int j = (int)(Left / _size_x); j <= (int)(Right / _size_x) + 1; j++) + { + if (_map[i, j] == _barrier) + return 0; + } + } + return 1; + } + 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); + // Првоерка, что объект не "накладывается" на закрытые участки + (float Left, float Right, float Top, float Bottom) = _drawningObject.GetCurrentPosition(); + float tempBottom = Bottom; + float tempTop = Top; + while (CheckBarrier((int)Right, (int)Left, (int)Top, (int)Bottom) == 0) + { + int flag = 0; + while (flag == 0) + { + flag = CheckBarrier((int)Right, (int)Left, (int)Top, (int)Bottom); + y += (int)_size_y; + Top += _size_y; + Bottom += _size_y; + _drawningObject.SetObject(x, y, _width, _height); + } + if (flag == 1) + { + return true; + } + x += (int)_size_x; + Left += _size_x; + Right += _size_x; + y = (int)tempTop; + Top = tempTop; + Bottom = tempBottom; + } + return false; + } + 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, j, i); + } + else if (_map[i, j] == _barrier) + { + DrawBarrierPart(gr, j, i); + } + } + } + _drawningObject.DrawningObject(gr); + return bmp; + } + 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/AirFighter/AirFighter/Direction.cs b/AirFighter/AirFighter/Direction.cs index 48cf999..b4601d4 100644 --- a/AirFighter/AirFighter/Direction.cs +++ b/AirFighter/AirFighter/Direction.cs @@ -11,6 +11,7 @@ namespace AirFighter /// internal enum Direction { + None = 0, Up = 1, Down = 2, Left = 3, diff --git a/AirFighter/AirFighter/FormMap.Designer.cs b/AirFighter/AirFighter/FormMap.Designer.cs new file mode 100644 index 0000000..26cb86a --- /dev/null +++ b/AirFighter/AirFighter/FormMap.Designer.cs @@ -0,0 +1,209 @@ +namespace AirFighter +{ + 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.pictureBoxAirFighter = new System.Windows.Forms.PictureBox(); + this.statusStrip = 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.buttonCreate = new System.Windows.Forms.Button(); + this.buttonUp = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonLeft = new System.Windows.Forms.Button(); + this.buttonRight = new System.Windows.Forms.Button(); + this.buttonUpgrade = new System.Windows.Forms.Button(); + this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirFighter)).BeginInit(); + this.statusStrip.SuspendLayout(); + this.SuspendLayout(); + // + // pictureBoxAirFighter + // + this.pictureBoxAirFighter.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBoxAirFighter.Location = new System.Drawing.Point(0, 0); + this.pictureBoxAirFighter.Name = "pictureBoxAirFighter"; + this.pictureBoxAirFighter.Size = new System.Drawing.Size(800, 424); + this.pictureBoxAirFighter.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBoxAirFighter.TabIndex = 0; + this.pictureBoxAirFighter.TabStop = false; + // + // statusStrip + // + this.statusStrip.ImageScalingSize = new System.Drawing.Size(20, 20); + this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabelBodyColor}); + this.statusStrip.Location = new System.Drawing.Point(0, 424); + this.statusStrip.Name = "statusStrip"; + this.statusStrip.Size = new System.Drawing.Size(800, 26); + this.statusStrip.TabIndex = 1; + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(80, 20); + this.toolStripStatusLabelSpeed.Text = "Скорость: "; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(40, 20); + this.toolStripStatusLabelWeight.Text = "Вес: "; + // + // toolStripStatusLabelBodyColor + // + this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(49, 20); + this.toolStripStatusLabelBodyColor.Text = "Цвет: "; + // + // buttonCreate + // + this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreate.Location = new System.Drawing.Point(39, 378); + this.buttonCreate.Name = "buttonCreate"; + this.buttonCreate.Size = new System.Drawing.Size(94, 29); + this.buttonCreate.TabIndex = 2; + this.buttonCreate.Text = "Создать"; + this.buttonCreate.UseVisualStyleBackColor = true; + this.buttonCreate.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::AirFighter.Properties.Resources.Up; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(722, 341); + 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); + // + // buttonDown + // + this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonDown.BackgroundImage = global::AirFighter.Properties.Resources.Down; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(722, 377); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(30, 30); + this.buttonDown.TabIndex = 4; + this.buttonDown.UseVisualStyleBackColor = true; + this.buttonDown.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::AirFighter.Properties.Resources.Left; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(686, 377); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(30, 30); + this.buttonLeft.TabIndex = 5; + this.buttonLeft.UseVisualStyleBackColor = true; + this.buttonLeft.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::AirFighter.Properties.Resources.Right; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(758, 378); + 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); + // + // buttonUpgrade + // + this.buttonUpgrade.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonUpgrade.Location = new System.Drawing.Point(148, 379); + this.buttonUpgrade.Name = "buttonUpgrade"; + this.buttonUpgrade.Size = new System.Drawing.Size(127, 29); + this.buttonUpgrade.TabIndex = 7; + this.buttonUpgrade.Text = "Модификация"; + this.buttonUpgrade.UseVisualStyleBackColor = true; + this.buttonUpgrade.Click += new System.EventHandler(this.ButtonUpgrade_Click); + // + // comboBoxSelectorMap + // + 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(12, 12); + this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; + this.comboBoxSelectorMap.Size = new System.Drawing.Size(151, 28); + this.comboBoxSelectorMap.TabIndex = 8; + 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(800, 450); + this.Controls.Add(this.comboBoxSelectorMap); + this.Controls.Add(this.buttonUpgrade); + this.Controls.Add(this.buttonRight); + this.Controls.Add(this.buttonLeft); + this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonUp); + this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.pictureBoxAirFighter); + this.Controls.Add(this.statusStrip); + this.Name = "FormMap"; + this.Text = "Карта"; + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirFighter)).EndInit(); + this.statusStrip.ResumeLayout(false); + this.statusStrip.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private PictureBox pictureBoxAirFighter; + private StatusStrip statusStrip; + private ToolStripStatusLabel toolStripStatusLabelSpeed; + private ToolStripStatusLabel toolStripStatusLabelWeight; + private ToolStripStatusLabel toolStripStatusLabelBodyColor; + private Button buttonCreate; + private Button buttonUp; + private Button buttonDown; + private Button buttonLeft; + private Button buttonRight; + private Button buttonUpgrade; + private ComboBox comboBoxSelectorMap; + } +} \ No newline at end of file diff --git a/AirFighter/AirFighter/FormMap.cs b/AirFighter/AirFighter/FormMap.cs new file mode 100644 index 0000000..551313c --- /dev/null +++ b/AirFighter/AirFighter/FormMap.cs @@ -0,0 +1,103 @@ +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 AirFighter +{ + public partial class FormMap : Form + { + private AbstractMap _abstractMap; + public FormMap() + { + InitializeComponent(); + _abstractMap = new SimpleMap(); + comboBoxSelectorMap.SelectedIndex = 0; + } + /// + /// Заполнение информации по объекту + /// + private void SetData(DrawningAirFighter airFighter) + { + + toolStripStatusLabelSpeed.Text = $"Скорость: {airFighter.AirFighter?.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {airFighter.AirFighter?.Weight}"; + toolStripStatusLabelBodyColor.Text = $"Цвет: {airFighter.AirFighter?.BodyColor}"; + pictureBoxAirFighter.Image = _abstractMap.CreateMap(pictureBoxAirFighter.Width, pictureBoxAirFighter.Height, + new DrawningObjectAirFighter(airFighter)); + } + /// + /// Обработка нажатия кнопки "Создать" + /// + /// + /// + private void ButtonCreate_Click(object sender, EventArgs e) + { + + Random rnd = new Random(); + var _airFighter = new DrawningAirFighter(rnd.Next(200, 500), rnd.Next(2000, 5000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + SetData(_airFighter); + } + + /// + /// Обработка нажатий кнопок перемещения + /// + /// + /// + 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; + } + pictureBoxAirFighter.Image = _abstractMap?.MoveObject(dir); + } + /// + /// Обработка нажатия кнопки "Модификация" + /// + /// + /// + private void ButtonUpgrade_Click(object sender, EventArgs e) + { + Random rnd = new(); + var _airFighter = new DrawningUpgradeAirFighter(rnd.Next(300, 600), rnd.Next(2000, 5000), 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))); + SetData(_airFighter); + } + /// + /// Изменение карты + /// + /// + /// + private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxSelectorMap.Text) + { + case "Простая карта": + _abstractMap = new SimpleMap(); + break; + case "Карта шторма": + _abstractMap = new StormMap(); + break; + } + } + } +} diff --git a/AirFighter/AirFighter/FormMap.resx b/AirFighter/AirFighter/FormMap.resx new file mode 100644 index 0000000..2c0949d --- /dev/null +++ b/AirFighter/AirFighter/FormMap.resx @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/AirFighter/AirFighter/Program.cs b/AirFighter/AirFighter/Program.cs index 61bec04..b613151 100644 --- a/AirFighter/AirFighter/Program.cs +++ b/AirFighter/AirFighter/Program.cs @@ -11,7 +11,7 @@ namespace AirFighter // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormAirFighter()); + Application.Run(new FormMap()); } } } \ No newline at end of file diff --git a/AirFighter/AirFighter/SimpleMap.cs b/AirFighter/AirFighter/SimpleMap.cs new file mode 100644 index 0000000..c6cf68b --- /dev/null +++ b/AirFighter/AirFighter/SimpleMap.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirFighter +{ + internal class SimpleMap : 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, (i + 1) * _size_x, (j + 1) * _size_y); + } + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, (i + 1) * _size_x, (j + 1) * _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++; + } + } + } + } +} diff --git a/AirFighter/AirFighter/StormMap.cs b/AirFighter/AirFighter/StormMap.cs new file mode 100644 index 0000000..b969ccc --- /dev/null +++ b/AirFighter/AirFighter/StormMap.cs @@ -0,0 +1,66 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirFighter +{ + internal class StormMap : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Brush barrierColor = new SolidBrush(Color.Black); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.FromArgb(168, 168, 168)); + /// + /// Дополнительный цвет открытого участка + /// + private readonly Brush dopRoadColor = new SolidBrush(Color.LightGray); + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, (i + 1) * _size_x, (j + 1) * _size_y); + } + + protected override void DrawRoadPart(Graphics g, int i, int j) + { + Random random = new Random(); + if (random.Next(0, 2) == 1) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, (i + 1) * _size_x, (j + 1) * _size_y); + } + else + { + g.FillRectangle(dopRoadColor, i * _size_x, j * _size_y, (i + 1) * _size_x, (j + 1) * _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