From 746f60a4b1fde36e03d70084a3e40f8d280b093e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=90=D0=BB=D0=B5=D0=B9?= =?UTF-8?q?=D0=BA=D0=B8=D0=BD?= Date: Tue, 4 Oct 2022 16:41:33 +0400 Subject: [PATCH 1/9] =?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/DrawningBomber.cs | 5 ++--- AirBomber/AirBomber/EntityAirBomber.cs | 4 ++-- AirBomber/AirBomber/FormAirBomber.cs | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/AirBomber/AirBomber/DrawningBomber.cs b/AirBomber/AirBomber/DrawningBomber.cs index 6b37f11..91422e1 100644 --- a/AirBomber/AirBomber/DrawningBomber.cs +++ b/AirBomber/AirBomber/DrawningBomber.cs @@ -16,10 +16,9 @@ namespace AirBomber private readonly int _airBomberWidth = 100; private readonly int _airBomberHeight = 100; - public void Init(int speed, float weight, Color bodyColor) + public DrawningBomber(int speed, float weight, Color bodyColor) { - AirBomber = new EntityAirBomber(); - AirBomber.Init(speed, weight, bodyColor); + AirBomber = new EntityAirBomber(speed, weight, bodyColor); } public void SetPosition(int x, int y, int width, int height) diff --git a/AirBomber/AirBomber/EntityAirBomber.cs b/AirBomber/AirBomber/EntityAirBomber.cs index 86c87af..8c5f25d 100644 --- a/AirBomber/AirBomber/EntityAirBomber.cs +++ b/AirBomber/AirBomber/EntityAirBomber.cs @@ -13,9 +13,9 @@ namespace AirBomber public Color BodyColor { get; private set; } public float Step => Speed * 100 / Weight; - public void Init(int speed, float weight, Color bodyColor) + public EntityAirBomber(int speed, float weight, Color bodyColor) { - Random rnd = new(); + Random rnd = new Random(); Speed = speed <= 0 ? rnd.Next(50, 150) : speed; Weight = weight <= 0 ? rnd.Next(40, 70) : weight; BodyColor = bodyColor; diff --git a/AirBomber/AirBomber/FormAirBomber.cs b/AirBomber/AirBomber/FormAirBomber.cs index f521ff7..f2b0106 100644 --- a/AirBomber/AirBomber/FormAirBomber.cs +++ b/AirBomber/AirBomber/FormAirBomber.cs @@ -19,8 +19,7 @@ namespace AirBomber private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _airBomber = new DrawningBomber(); - _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 DrawningBomber(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 cf4b1b18eceddaad5c31b61313b7b93ede26c962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=90=D0=BB=D0=B5=D0=B9?= =?UTF-8?q?=D0=BA=D0=B8=D0=BD?= Date: Tue, 4 Oct 2022 17:41:20 +0400 Subject: [PATCH 2/9] =?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 --- AirBomber/AirBomber/DrawningBomber.cs | 18 ++++--- AirBomber/AirBomber/DrawningWarplane.cs | 53 +++++++++++++++++++ AirBomber/AirBomber/EntityWarplane.cs | 25 +++++++++ AirBomber/AirBomber/FormAirBomber.Designer.cs | 14 +++++ AirBomber/AirBomber/FormAirBomber.cs | 23 +++++++- 5 files changed, 125 insertions(+), 8 deletions(-) create mode 100644 AirBomber/AirBomber/DrawningWarplane.cs create mode 100644 AirBomber/AirBomber/EntityWarplane.cs diff --git a/AirBomber/AirBomber/DrawningBomber.cs b/AirBomber/AirBomber/DrawningBomber.cs index 91422e1..ed8491e 100644 --- a/AirBomber/AirBomber/DrawningBomber.cs +++ b/AirBomber/AirBomber/DrawningBomber.cs @@ -8,9 +8,9 @@ namespace AirBomber { internal class DrawningBomber { - public EntityAirBomber AirBomber { private set; get; } - private float _startPosX; - private float _startPosY; + public EntityAirBomber AirBomber { protected set; get; } + protected float _startPosX; + protected float _startPosY; private int? _pictureWidth = null; private int? _pictureHeight = null; private readonly int _airBomberWidth = 100; @@ -21,6 +21,13 @@ namespace AirBomber AirBomber = new EntityAirBomber(speed, weight, bodyColor); } + protected DrawningBomber(int speed, float weight, Color bodyColor, int airBomberWidth, int airBomberHeight) : + this (speed, weight, bodyColor) + { + _airBomberWidth = airBomberWidth; + _airBomberHeight = airBomberHeight; + } + public void SetPosition(int x, int y, int width, int height) { if (x + _airBomberWidth > width || x < 0) return; @@ -66,7 +73,7 @@ namespace AirBomber } } - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue) { @@ -101,8 +108,7 @@ namespace AirBomber new Point((int)(_startPosX), (int)(_startPosY + _airBomberHeight / 2)), new Point((int)(_startPosX + 20), (int)(_startPosY + _airBomberHeight / 2 - 5)), new Point((int)(_startPosX + 20), (int)(_startPosY + _airBomberHeight / 2 + 5)), - }); - + }); } public void ChangeBorders(int width, int height) diff --git a/AirBomber/AirBomber/DrawningWarplane.cs b/AirBomber/AirBomber/DrawningWarplane.cs new file mode 100644 index 0000000..e5b4c34 --- /dev/null +++ b/AirBomber/AirBomber/DrawningWarplane.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirBomber +{ + internal class DrawningWarplane : DrawningBomber + { + public DrawningWarplane(int speed, float weight, Color bodyColor, Color dopColor, bool engines, bool weapons) : + base(speed, weight, bodyColor, 120, 120) + { + AirBomber = new EntityWarplane(speed, weight, bodyColor, dopColor, engines, weapons); + } + + public override void DrawTransport(Graphics g) + { + if (AirBomber is not EntityWarplane warplane) + { + return; + } + + Pen pen = new Pen(Color.Black); + Brush dopBrush = new SolidBrush(warplane.DopColor); + + if (warplane.Engines) + { + + g.FillEllipse(dopBrush, _startPosX + 50, _startPosY + 15, 30, 15); + g.FillEllipse(dopBrush, _startPosX + 45, _startPosY + 35, 35, 15); + g.FillEllipse(dopBrush, _startPosX + 45, _startPosY + 70, 35, 15); + g.FillEllipse(dopBrush, _startPosX + 50, _startPosY + 90, 30, 15); + + g.DrawEllipse(pen, _startPosX + 50, _startPosY + 15, 30, 15); + g.DrawEllipse(pen, _startPosX + 45, _startPosY + 35, 35, 15); + g.DrawEllipse(pen, _startPosX + 45, _startPosY + 70, 35, 15); + g.DrawEllipse(pen, _startPosX + 50, _startPosY + 90, 30, 15); + } + if (warplane.Weapons) + { + g.FillRectangle(dopBrush, _startPosX + 40, _startPosY, 30, 5); + g.FillRectangle(dopBrush, _startPosX + 40, _startPosY + 115, 30, 5); + + g.DrawRectangle(pen, _startPosX + 40, _startPosY, 30, 5); + g.DrawRectangle(pen, _startPosX + 40, _startPosY + 115, 30, 5); + } + + base.DrawTransport(g); + } + } +} diff --git a/AirBomber/AirBomber/EntityWarplane.cs b/AirBomber/AirBomber/EntityWarplane.cs new file mode 100644 index 0000000..f66ecac --- /dev/null +++ b/AirBomber/AirBomber/EntityWarplane.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirBomber +{ + internal class EntityWarplane : EntityAirBomber + { + public Color DopColor { get; private set; } + + public bool Engines { get; private set; } + + public bool Weapons { get; private set; } + + public EntityWarplane(int speed, float weight, Color bodyColor, Color dopColor, bool engines, bool weapons) : + base(speed, weight, bodyColor) + { + DopColor = dopColor; + Engines = engines; + Weapons = weapons; + } + } +} diff --git a/AirBomber/AirBomber/FormAirBomber.Designer.cs b/AirBomber/AirBomber/FormAirBomber.Designer.cs index 9234790..47ac65b 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.statusStrip.SuspendLayout(); this.SuspendLayout(); @@ -141,11 +142,23 @@ this.buttonRight.UseVisualStyleBackColor = true; this.buttonRight.Click += new System.EventHandler(this.ButtonCreate_Move); // + // 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(109, 455); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(110, 35); + 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(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(874, 515); + this.Controls.Add(this.buttonCreateModif); this.Controls.Add(this.buttonRight); this.Controls.Add(this.buttonDown); this.Controls.Add(this.buttonLeft); @@ -175,5 +188,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 f2b0106..8703674 100644 --- a/AirBomber/AirBomber/FormAirBomber.cs +++ b/AirBomber/AirBomber/FormAirBomber.cs @@ -1,3 +1,5 @@ +using System; + namespace AirBomber { public partial class FormAirBomber : Form @@ -16,14 +18,20 @@ namespace AirBomber pictureBoxAirBomber.Image = bmp; } - private void ButtonCreate_Click(object sender, EventArgs e) + private void SetData() { Random rnd = new(); - _airBomber = new DrawningBomber(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}"; toolStripStatusLabelBodyColor.Text = $": {_airBomber.AirBomber.BodyColor}"; + } + + private void ButtonCreate_Click(object sender, EventArgs e) + { + Random rnd = new(); + _airBomber = new DrawningBomber(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + SetData(); Draw(); } @@ -53,5 +61,16 @@ namespace AirBomber _airBomber?.ChangeBorders(pictureBoxAirBomber.Width, pictureBoxAirBomber.Height); Draw(); } + + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + _airBomber = new DrawningWarplane(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))); + SetData(); + Draw(); + } } } \ No newline at end of file -- 2.25.1 From b83531e445ffe52dc71f5900386be6c627501da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=90=D0=BB=D0=B5=D0=B9?= =?UTF-8?q?=D0=BA=D0=B8=D0=BD?= Date: Tue, 4 Oct 2022 18:24:13 +0400 Subject: [PATCH 3/9] =?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/DrawningBomber.cs | 5 +++ AirBomber/AirBomber/DrawningObjectBomber.cs | 40 +++++++++++++++++++++ AirBomber/AirBomber/IDrawningObject.cs | 21 +++++++++++ 3 files changed, 66 insertions(+) create mode 100644 AirBomber/AirBomber/DrawningObjectBomber.cs create mode 100644 AirBomber/AirBomber/IDrawningObject.cs diff --git a/AirBomber/AirBomber/DrawningBomber.cs b/AirBomber/AirBomber/DrawningBomber.cs index ed8491e..d9f1ee5 100644 --- a/AirBomber/AirBomber/DrawningBomber.cs +++ b/AirBomber/AirBomber/DrawningBomber.cs @@ -130,5 +130,10 @@ namespace AirBomber _startPosY = _pictureHeight.Value - _airBomberHeight; } } + + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return (_startPosX, _startPosY, _startPosX + _airBomberWidth, _airBomberHeight); + } } } diff --git a/AirBomber/AirBomber/DrawningObjectBomber.cs b/AirBomber/AirBomber/DrawningObjectBomber.cs new file mode 100644 index 0000000..71d23ba --- /dev/null +++ b/AirBomber/AirBomber/DrawningObjectBomber.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirBomber +{ + internal class DrawningObjectBomber : IDrawningObject + { + private DrawningBomber _airBomber = null; + + public DrawningObjectBomber(DrawningBomber 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); + } + + public void DrawningObject(Graphics g) + { + + } + } +} diff --git a/AirBomber/AirBomber/IDrawningObject.cs b/AirBomber/AirBomber/IDrawningObject.cs new file mode 100644 index 0000000..02ba166 --- /dev/null +++ b/AirBomber/AirBomber/IDrawningObject.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirBomber +{ + internal interface IDrawningObject + { + public float Step { get; } + + 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 4274d8eab51c8e51cf53cb0b77786df1a5f5ae6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=90=D0=BB=D0=B5=D0=B9?= =?UTF-8?q?=D0=BA=D0=B8=D0=BD?= Date: Tue, 4 Oct 2022 19:53:20 +0400 Subject: [PATCH 4/9] =?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 --- AirBomber/AirBomber/AbstractMap.cs | 88 +++++++++ AirBomber/AirBomber/Direction.cs | 1 + AirBomber/AirBomber/DrawningObjectBomber.cs | 2 +- AirBomber/AirBomber/FormAirBomber.cs | 1 + AirBomber/AirBomber/FormMap.Designer.cs | 209 ++++++++++++++++++++ AirBomber/AirBomber/FormMap.cs | 81 ++++++++ AirBomber/AirBomber/FormMap.resx | 63 ++++++ AirBomber/AirBomber/Program.cs | 2 +- AirBomber/AirBomber/SimpleMap.cs | 49 +++++ 9 files changed, 494 insertions(+), 2 deletions(-) create mode 100644 AirBomber/AirBomber/AbstractMap.cs 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/SimpleMap.cs diff --git a/AirBomber/AirBomber/AbstractMap.cs b/AirBomber/AirBomber/AbstractMap.cs new file mode 100644 index 0000000..f1f8a5d --- /dev/null +++ b/AirBomber/AirBomber/AbstractMap.cs @@ -0,0 +1,88 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirBomber +{ + 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 heigth, IDrawningObject drawningObject) + { + _width = width; + _height = heigth; + _drawningObject = drawningObject; + GenerateMap(); + while (!SetObjectOnMap()) + { + GenerateMap(); + } + return DrawMapWithObject(); + } + + public Bitmap MoveObject(Direction direction) + { + //TODO + if (true) + { + _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); + //TODO + 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.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/AirBomber/AirBomber/Direction.cs b/AirBomber/AirBomber/Direction.cs index 306144d..5f01285 100644 --- a/AirBomber/AirBomber/Direction.cs +++ b/AirBomber/AirBomber/Direction.cs @@ -8,6 +8,7 @@ namespace AirBomber { internal enum Direction { + None = 0, Up = 1, Down = 2, Left = 3, diff --git a/AirBomber/AirBomber/DrawningObjectBomber.cs b/AirBomber/AirBomber/DrawningObjectBomber.cs index 71d23ba..4254f8c 100644 --- a/AirBomber/AirBomber/DrawningObjectBomber.cs +++ b/AirBomber/AirBomber/DrawningObjectBomber.cs @@ -34,7 +34,7 @@ namespace AirBomber public void DrawningObject(Graphics g) { - + //TODO } } } diff --git a/AirBomber/AirBomber/FormAirBomber.cs b/AirBomber/AirBomber/FormAirBomber.cs index 8703674..059297a 100644 --- a/AirBomber/AirBomber/FormAirBomber.cs +++ b/AirBomber/AirBomber/FormAirBomber.cs @@ -72,5 +72,6 @@ namespace AirBomber SetData(); Draw(); } + } } \ No newline at end of file diff --git a/AirBomber/AirBomber/FormMap.Designer.cs b/AirBomber/AirBomber/FormMap.Designer.cs new file mode 100644 index 0000000..1741191 --- /dev/null +++ b/AirBomber/AirBomber/FormMap.Designer.cs @@ -0,0 +1,209 @@ +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.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.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.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirBomber)).BeginInit(); + this.statusStrip.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(858, 476); + this.pictureBoxAirBomber.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBoxAirBomber.TabIndex = 0; + this.pictureBoxAirBomber.TabStop = false; + // + // statusStrip + // + this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabelBodyColor}); + this.statusStrip.Location = new System.Drawing.Point(0, 454); + this.statusStrip.Name = "statusStrip"; + this.statusStrip.Size = new System.Drawing.Size(858, 22); + this.statusStrip.TabIndex = 1; + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(62, 17); + this.toolStripStatusLabelSpeed.Text = "Скорость:"; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(29, 17); + this.toolStripStatusLabelWeight.Text = "Вес:"; + // + // toolStripStatusLabelBodyColor + // + this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(36, 17); + 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(20, 402); + this.buttonCreate.Name = "buttonCreate"; + this.buttonCreate.Size = new System.Drawing.Size(79, 35); + 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::AirBomber.Properties.Resources.ArrowUp; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(780, 371); + 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.ButtonCreate_Move); + // + // 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(744, 407); + 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.ButtonCreate_Move); + // + // 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(780, 407); + 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.ButtonCreate_Move); + // + // 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(816, 407); + 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.ButtonCreate_Move); + // + // 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(117, 402); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(110, 35); + this.buttonCreateModif.TabIndex = 7; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_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(21, 12); + this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; + this.comboBoxSelectorMap.Size = new System.Drawing.Size(121, 23); + this.comboBoxSelectorMap.TabIndex = 8; + this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.comboBoxSelectorMap_SelectedIndexChanged); + // + // FormMap + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(858, 476); + this.Controls.Add(this.comboBoxSelectorMap); + this.Controls.Add(this.buttonCreateModif); + this.Controls.Add(this.buttonRight); + this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonLeft); + this.Controls.Add(this.buttonUp); + this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.statusStrip); + this.Controls.Add(this.pictureBoxAirBomber); + this.Name = "FormMap"; + this.Text = "FormMap"; + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirBomber)).EndInit(); + this.statusStrip.ResumeLayout(false); + this.statusStrip.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + + + #endregion + + private PictureBox pictureBoxAirBomber; + private StatusStrip statusStrip; + private ToolStripStatusLabel toolStripStatusLabelSpeed; + private ToolStripStatusLabel toolStripStatusLabelWeight; + private ToolStripStatusLabel toolStripStatusLabelBodyColor; + private Button buttonCreate; + private Button buttonUp; + private Button buttonLeft; + private Button buttonDown; + private Button buttonRight; + private Button buttonCreateModif; + 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..f1e39bf --- /dev/null +++ b/AirBomber/AirBomber/FormMap.cs @@ -0,0 +1,81 @@ +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(DrawningBomber 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 DrawningObjectBomber(airBomber)); + } + + private void ButtonCreate_Click(object sender, EventArgs e) + { + Random rnd = new(); + var airBomber = new DrawningBomber(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 ButtonCreate_Move(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 DrawningWarplane(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))); + SetData(airBomber); + } + + private void comboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxSelectorMap.Text) + { + case "Простая карта": + _abstractMap = new SimpleMap(); + break; + } + } + } +} diff --git a/AirBomber/AirBomber/FormMap.resx b/AirBomber/AirBomber/FormMap.resx new file mode 100644 index 0000000..2c0949d --- /dev/null +++ b/AirBomber/AirBomber/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/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..dc1e3fc --- /dev/null +++ b/AirBomber/AirBomber/SimpleMap.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 SimpleMap : AbstractMap + { + Brush barrierColor = new SolidBrush(Color.Black); + 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, i * (_size_x + 1), j * (_size_y + 1)); + } + + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + } + + 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 From 550f65c1c21c850388fc341d8a7088d3f93cb4c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=90=D0=BB=D0=B5=D0=B9?= =?UTF-8?q?=D0=BA=D0=B8=D0=BD?= Date: Wed, 5 Oct 2022 00:00:52 +0400 Subject: [PATCH 5/9] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D0=B8=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=201=20=D1=84=D0=BF=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirBomber/AirBomber/AbstractMap.cs | 2 +- AirBomber/AirBomber/SimpleMap.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AirBomber/AirBomber/AbstractMap.cs b/AirBomber/AirBomber/AbstractMap.cs index f1f8a5d..e1b34b4 100644 --- a/AirBomber/AirBomber/AbstractMap.cs +++ b/AirBomber/AirBomber/AbstractMap.cs @@ -33,7 +33,7 @@ namespace AirBomber } public Bitmap MoveObject(Direction direction) - { + { //TODO if (true) { diff --git a/AirBomber/AirBomber/SimpleMap.cs b/AirBomber/AirBomber/SimpleMap.cs index dc1e3fc..b4eb779 100644 --- a/AirBomber/AirBomber/SimpleMap.cs +++ b/AirBomber/AirBomber/SimpleMap.cs @@ -13,12 +13,12 @@ namespace AirBomber protected override void DrawBarrierPart(Graphics g, int i, int j) { - g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, 20, 20); } protected override void DrawRoadPart(Graphics g, int i, int j) { - g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + g.FillRectangle(roadColor, i * _size_x, j * _size_y, 20, 20); } protected override void GenerateMap() -- 2.25.1 From f1f865331b8a46f6519632119f12c5d351976dad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=90=D0=BB=D0=B5=D0=B9?= =?UTF-8?q?=D0=BA=D0=B8=D0=BD?= Date: Wed, 5 Oct 2022 00:09:23 +0400 Subject: [PATCH 6/9] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D0=B8=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=BE=D1=82=D1=80=D0=B8=D1=81=D0=BE=D0=B2=D0=BA=D1=83=20?= =?UTF-8?q?=D1=81=D1=83=D1=89=D0=BD=D0=BE=D1=81=D1=82=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirBomber/AirBomber/DrawningObjectBomber.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AirBomber/AirBomber/DrawningObjectBomber.cs b/AirBomber/AirBomber/DrawningObjectBomber.cs index 4254f8c..532fdf2 100644 --- a/AirBomber/AirBomber/DrawningObjectBomber.cs +++ b/AirBomber/AirBomber/DrawningObjectBomber.cs @@ -34,7 +34,7 @@ namespace AirBomber public void DrawningObject(Graphics g) { - //TODO + _airBomber.DrawTransport(g); } } } -- 2.25.1 From 9d01e9ae664e7cf1b8ebcdd91ae13b61cb6197fb Mon Sep 17 00:00:00 2001 From: the Date: Wed, 5 Oct 2022 11:05:07 +0400 Subject: [PATCH 7/9] =?UTF-8?q?=D0=9D=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=B0=D0=B5=D1=82=20=D0=BA=D0=BE=D0=BB=D0=BB=D0=B8=D0=B7?= =?UTF-8?q?=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirBomber/AirBomber/AbstractMap.cs | 63 +++++++++++++++++++++++++-- AirBomber/AirBomber/DrawningBomber.cs | 2 +- AirBomber/AirBomber/SimpleMap.cs | 4 +- 3 files changed, 63 insertions(+), 6 deletions(-) diff --git a/AirBomber/AirBomber/AbstractMap.cs b/AirBomber/AirBomber/AbstractMap.cs index e1b34b4..2754461 100644 --- a/AirBomber/AirBomber/AbstractMap.cs +++ b/AirBomber/AirBomber/AbstractMap.cs @@ -32,12 +32,69 @@ namespace AirBomber return DrawMapWithObject(); } + private bool CanMove(Direction direction, (float Left, float Right, float Top, float Bottom) position) + { + if (direction == Direction.Left) + { + for (int i = (int)((position.Left - _drawningObject.Step) / _size_y); i <= (int)(position.Left / _size_y); ++i) + { + for (int j = (int)(position.Top / _size_x); j <= (int)(position.Bottom / _size_x); ++j) + { + if (i >= 0 && _map[i,j] == _barrier) + { + return false; + } + } + } + } + else if (direction == Direction.Right) + { + for (int i = (int)(position.Right / _size_y); i <= (int)((position.Right + _drawningObject.Step) / _size_y); ++i) + { + for (int j = (int)(position.Top / _size_x); j <= (int)(position.Bottom / _size_x); ++j) + { + if (i <= _map.GetLength(0) && _map[i, j] == _barrier) + { + return false; + } + } + } + } + else if (direction == Direction.Up) + { + for (int i = (int)(position.Left / _size_y); i <= (int)(position.Right / _size_y); ++i) + { + for (int j = (int)((position.Top - _drawningObject.Step) / _size_x); j <= (int)(position.Top / _size_x); ++j) + { + if (j >= 0 && _map[i, j] == _barrier) + { + return false; + } + } + } + } + else if (direction == Direction.Down) + { + for (int i = (int)(position.Left / _size_y); i <= (int)(position.Right / _size_y); ++i) + { + for (int j = (int)(position.Bottom / _size_x); j <= (int)((position.Bottom + _drawningObject.Step) / _size_x); ++j) + { + if (j <= _map.GetLength(1) && _map[i, j] == _barrier) + { + return false; + } + } + } + } + return true; + } + public Bitmap MoveObject(Direction direction) - { - //TODO - if (true) + { + if (CanMove(direction, _drawningObject.GetCurrentPosition())) { _drawningObject.MoveObject(direction); + } return DrawMapWithObject(); } diff --git a/AirBomber/AirBomber/DrawningBomber.cs b/AirBomber/AirBomber/DrawningBomber.cs index d9f1ee5..6b0e810 100644 --- a/AirBomber/AirBomber/DrawningBomber.cs +++ b/AirBomber/AirBomber/DrawningBomber.cs @@ -133,7 +133,7 @@ namespace AirBomber public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() { - return (_startPosX, _startPosY, _startPosX + _airBomberWidth, _airBomberHeight); + return (_startPosX, _startPosX + _airBomberWidth, _startPosY, _startPosY + _airBomberHeight); } } } diff --git a/AirBomber/AirBomber/SimpleMap.cs b/AirBomber/AirBomber/SimpleMap.cs index b4eb779..347fcdb 100644 --- a/AirBomber/AirBomber/SimpleMap.cs +++ b/AirBomber/AirBomber/SimpleMap.cs @@ -13,12 +13,12 @@ namespace AirBomber protected override void DrawBarrierPart(Graphics g, int i, int j) { - g.FillRectangle(barrierColor, i * _size_x, j * _size_y, 20, 20); + g.FillRectangle(barrierColor, j * _size_x, i * _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, 20, 20); + g.FillRectangle(roadColor, j * _size_x, i * _size_y, _size_x, _size_y); } protected override void GenerateMap() -- 2.25.1 From 4ec1797948e962ad790462c129cc647fc8d7cebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=90=D0=BB=D0=B5=D0=B9?= =?UTF-8?q?=D0=BA=D0=B8=D0=BD?= Date: Tue, 18 Oct 2022 20:56:42 +0400 Subject: [PATCH 8/9] =?UTF-8?q?=D0=9F=D0=BE=D0=BB=D0=BD=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D1=8C=D1=8E=20=D0=B4=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?= =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D1=83=202.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirBomber/AirBomber/AbstractMap.cs | 89 ++++++++++--------------- AirBomber/AirBomber/DrawningBomber.cs | 4 +- AirBomber/AirBomber/FormMap.Designer.cs | 6 +- AirBomber/AirBomber/FormMap.cs | 7 ++ AirBomber/AirBomber/SecondMap.cs | 49 ++++++++++++++ AirBomber/AirBomber/SimpleMap.cs | 2 +- AirBomber/AirBomber/ThirdMap.cs | 49 ++++++++++++++ 7 files changed, 148 insertions(+), 58 deletions(-) create mode 100644 AirBomber/AirBomber/SecondMap.cs create mode 100644 AirBomber/AirBomber/ThirdMap.cs diff --git a/AirBomber/AirBomber/AbstractMap.cs b/AirBomber/AirBomber/AbstractMap.cs index 2754461..09a11d9 100644 --- a/AirBomber/AirBomber/AbstractMap.cs +++ b/AirBomber/AirBomber/AbstractMap.cs @@ -24,66 +24,21 @@ namespace AirBomber _width = width; _height = heigth; _drawningObject = drawningObject; - GenerateMap(); + GenerateMap(); while (!SetObjectOnMap()) { - GenerateMap(); + GenerateMap(); } return DrawMapWithObject(); } private bool CanMove(Direction direction, (float Left, float Right, float Top, float Bottom) position) - { - if (direction == Direction.Left) + { + for (int i = (int)(position.Top / _size_y); i <= (int)(position.Bottom / _size_y); ++i) { - for (int i = (int)((position.Left - _drawningObject.Step) / _size_y); i <= (int)(position.Left / _size_y); ++i) + for (int j = (int)(position.Left / _size_x); j <= (int)(position.Right / _size_x); ++j) { - for (int j = (int)(position.Top / _size_x); j <= (int)(position.Bottom / _size_x); ++j) - { - if (i >= 0 && _map[i,j] == _barrier) - { - return false; - } - } - } - } - else if (direction == Direction.Right) - { - for (int i = (int)(position.Right / _size_y); i <= (int)((position.Right + _drawningObject.Step) / _size_y); ++i) - { - for (int j = (int)(position.Top / _size_x); j <= (int)(position.Bottom / _size_x); ++j) - { - if (i <= _map.GetLength(0) && _map[i, j] == _barrier) - { - return false; - } - } - } - } - else if (direction == Direction.Up) - { - for (int i = (int)(position.Left / _size_y); i <= (int)(position.Right / _size_y); ++i) - { - for (int j = (int)((position.Top - _drawningObject.Step) / _size_x); j <= (int)(position.Top / _size_x); ++j) - { - if (j >= 0 && _map[i, j] == _barrier) - { - return false; - } - } - } - } - else if (direction == Direction.Down) - { - for (int i = (int)(position.Left / _size_y); i <= (int)(position.Right / _size_y); ++i) - { - for (int j = (int)(position.Bottom / _size_x); j <= (int)((position.Bottom + _drawningObject.Step) / _size_x); ++j) - { - if (j <= _map.GetLength(1) && _map[i, j] == _barrier) - { - return false; - } - } + if (i >= 0 && j >= 0 && i < _map.GetLength(0) && j < _map.GetLength(1) && _map[i, j] == _barrier) return false; } } return true; @@ -91,10 +46,27 @@ namespace AirBomber public Bitmap MoveObject(Direction direction) { - if (CanMove(direction, _drawningObject.GetCurrentPosition())) + (float Left, float Right, float Top, float Bottom) position = _drawningObject.GetCurrentPosition(); + if (direction == Direction.Left) + { + position.Left -= _drawningObject.Step; + } + else if (direction == Direction.Right) + { + position.Right += _drawningObject.Step; + } + else if (direction == Direction.Up) + { + position.Top -= _drawningObject.Step; + } + else if (direction == Direction.Down) + { + position.Bottom += _drawningObject.Step; + } + + if (CanMove(direction, position)) { _drawningObject.MoveObject(direction); - } return DrawMapWithObject(); } @@ -107,8 +79,17 @@ namespace AirBomber } int x = _random.Next(0, 10); int y = _random.Next(0, 10); + _drawningObject.SetObject(x, y, _width, _height); - //TODO + (float Left, float Right, float Top, float Bottom) position = _drawningObject.GetCurrentPosition(); + for (int i = (int)(position.Top / _size_y); i <= (int)(position.Bottom / _size_y); ++i) + { + for (int j = (int)(position.Left / _size_x); j <= (int)(position.Right / _size_x); ++j) + { + _map[i, j] = _freeRoad; + } + } + return true; } diff --git a/AirBomber/AirBomber/DrawningBomber.cs b/AirBomber/AirBomber/DrawningBomber.cs index 6b0e810..dcb4edf 100644 --- a/AirBomber/AirBomber/DrawningBomber.cs +++ b/AirBomber/AirBomber/DrawningBomber.cs @@ -80,6 +80,8 @@ namespace AirBomber return; } + Pen pen = new Pen(Color.Black); + SolidBrush brush = new SolidBrush(AirBomber?.BodyColor ?? Color.Cyan); g.FillPolygon(brush, new[] { @@ -108,7 +110,7 @@ namespace AirBomber new Point((int)(_startPosX), (int)(_startPosY + _airBomberHeight / 2)), new Point((int)(_startPosX + 20), (int)(_startPosY + _airBomberHeight / 2 - 5)), new Point((int)(_startPosX + 20), (int)(_startPosY + _airBomberHeight / 2 + 5)), - }); + }); } public void ChangeBorders(int width, int height) diff --git a/AirBomber/AirBomber/FormMap.Designer.cs b/AirBomber/AirBomber/FormMap.Designer.cs index 1741191..99527c8 100644 --- a/AirBomber/AirBomber/FormMap.Designer.cs +++ b/AirBomber/AirBomber/FormMap.Designer.cs @@ -158,8 +158,10 @@ 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(21, 12); + "Простая карта", + "Вторая карта", + "Третья карта"}); + this.comboBoxSelectorMap.Location = new System.Drawing.Point(20, 12); this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; this.comboBoxSelectorMap.Size = new System.Drawing.Size(121, 23); this.comboBoxSelectorMap.TabIndex = 8; diff --git a/AirBomber/AirBomber/FormMap.cs b/AirBomber/AirBomber/FormMap.cs index f1e39bf..8bbcf54 100644 --- a/AirBomber/AirBomber/FormMap.cs +++ b/AirBomber/AirBomber/FormMap.cs @@ -17,6 +17,7 @@ namespace AirBomber public FormMap() { InitializeComponent(); + comboBoxSelectorMap.SelectedIndex = 0; _abstractMap = new SimpleMap(); } @@ -75,6 +76,12 @@ namespace AirBomber case "Простая карта": _abstractMap = new SimpleMap(); break; + case "Вторая карта": + _abstractMap = new SecondMap(); + break; + case "Третья карта": + _abstractMap = new ThirdMap(); + break; } } } diff --git a/AirBomber/AirBomber/SecondMap.cs b/AirBomber/AirBomber/SecondMap.cs new file mode 100644 index 0000000..a2316df --- /dev/null +++ b/AirBomber/AirBomber/SecondMap.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 SecondMap : AbstractMap + { + Brush barrierColor = new SolidBrush(Color.Yellow); + Brush roadColor = new SolidBrush(Color.Blue); + + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, j * _size_x, i * _size_y, _size_x, _size_y); + } + + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, j * _size_x, i * _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 < 35) + { + 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/AirBomber/AirBomber/SimpleMap.cs b/AirBomber/AirBomber/SimpleMap.cs index 347fcdb..fb904d0 100644 --- a/AirBomber/AirBomber/SimpleMap.cs +++ b/AirBomber/AirBomber/SimpleMap.cs @@ -34,7 +34,7 @@ namespace AirBomber _map[i, j] = _freeRoad; } } - while (counter < 50) + while (counter < 250) { int x = _random.Next(0, 100); int y = _random.Next(0, 100); diff --git a/AirBomber/AirBomber/ThirdMap.cs b/AirBomber/AirBomber/ThirdMap.cs new file mode 100644 index 0000000..6ae0bb5 --- /dev/null +++ b/AirBomber/AirBomber/ThirdMap.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 ThirdMap : AbstractMap + { + Brush barrierColor = new SolidBrush(Color.Red); + Brush roadColor = new SolidBrush(Color.DarkGreen); + + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, j * _size_x, i * _size_y, _size_x, _size_y); + } + + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, j * _size_x, i * _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 < 40) + { + 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 From fae3a22b32ea4f989df82414c7dcf5c420d4b68c Mon Sep 17 00:00:00 2001 From: "d.agil" Date: Wed, 19 Oct 2022 09:45:01 +0400 Subject: [PATCH 9/9] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D0=B0=D1=8F=202=20=D0=BB=D0=B0=D0=B1=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirBomber/AirBomber/IDrawningObject.cs | 2 +- AirBomber/AirBomber/SimpleMap.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AirBomber/AirBomber/IDrawningObject.cs b/AirBomber/AirBomber/IDrawningObject.cs index 02ba166..22f6bc9 100644 --- a/AirBomber/AirBomber/IDrawningObject.cs +++ b/AirBomber/AirBomber/IDrawningObject.cs @@ -14,7 +14,7 @@ namespace AirBomber void MoveObject(Direction direction); - void DrawningObject(Graphics g); + void DrawningObject(Graphics g); (float Left, float Right, float Top, float Bottom) GetCurrentPosition(); } diff --git a/AirBomber/AirBomber/SimpleMap.cs b/AirBomber/AirBomber/SimpleMap.cs index fb904d0..347fcdb 100644 --- a/AirBomber/AirBomber/SimpleMap.cs +++ b/AirBomber/AirBomber/SimpleMap.cs @@ -34,7 +34,7 @@ namespace AirBomber _map[i, j] = _freeRoad; } } - while (counter < 250) + while (counter < 50) { int x = _random.Next(0, 100); int y = _random.Next(0, 100); -- 2.25.1