From ba856b7880e6e380a54dd7ef1919603731d2d49b Mon Sep 17 00:00:00 2001 From: foxkerik6 Date: Tue, 18 Oct 2022 01:56:17 +0400 Subject: [PATCH 1/3] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BC=D0=BE=D0=B4=D0=B8=D1=84=D0=B8=D0=BA=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Stormtrooper/DrawningMilitaryAirplane.cs | 30 ++++----- .../Stormtrooper/DrawningStormtrooper.cs | 48 ++++++++++++++ .../Stormtrooper/EntityMilitaryAirplane.cs | 2 +- .../Stormtrooper/EntityStormtrooper.cs | 39 ++++++++++++ .../Stormtrooper/MainForm.Designer.cs | 50 ++++++++++----- Stormtrooper/Stormtrooper/MainForm.cs | 25 ++++++-- Stormtrooper/Stormtrooper/MainForm.resx | 62 +------------------ 7 files changed, 160 insertions(+), 96 deletions(-) create mode 100644 Stormtrooper/Stormtrooper/DrawningStormtrooper.cs create mode 100644 Stormtrooper/Stormtrooper/EntityStormtrooper.cs diff --git a/Stormtrooper/Stormtrooper/DrawningMilitaryAirplane.cs b/Stormtrooper/Stormtrooper/DrawningMilitaryAirplane.cs index ae4784f..13ba0cd 100644 --- a/Stormtrooper/Stormtrooper/DrawningMilitaryAirplane.cs +++ b/Stormtrooper/Stormtrooper/DrawningMilitaryAirplane.cs @@ -12,15 +12,15 @@ namespace Stormtrooper /// /// Класс-сущность /// - public EntityMilitaryAirplane Airplane { get; private set; } + public EntityMilitaryAirplane Airplane { get; protected set; } /// /// Левая координата отрисовки автомобиля /// - private float _startPosX; + protected float _startPosX; /// /// Верхняя кооридната отрисовки автомобиля /// - private float _startPosY; + protected float _startPosY; /// /// Ширина окна отрисовки /// @@ -32,15 +32,16 @@ namespace Stormtrooper /// /// Ширина отрисовки самолёта /// - private readonly int _airplaneWidth = 80; + protected readonly int _airplaneWidth; /// /// Высота отрисовки самолёта /// - private readonly int _airplaneHeight = 100; - public void Init(int speed, int weight) + protected readonly int _airplaneHeight; + public DrawningMilitaryAirplane(int speed, int weight, int wight = 80, int height = 100) { - Airplane = new EntityMilitaryAirplane(); - Airplane.Init(speed, weight); + Airplane = new EntityMilitaryAirplane(speed, weight); + _airplaneWidth = wight; + _airplaneHeight = height; } public void SetPosition(int x, int y, int width, int height) @@ -99,7 +100,7 @@ namespace Stormtrooper } } - public void DrawAirplane(Graphics g) + public virtual void DrawAirplane(Graphics g) { if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue) @@ -109,23 +110,24 @@ namespace Stormtrooper Pen pen = new Pen(Color.Black); - Brush brush = new SolidBrush(Color.Black); + Brush brush = new SolidBrush(Color.DarkGreen); g.FillPolygon(brush, new PointF[3] {new PointF(_startPosX, _startPosY + _airplaneHeight / 2), new PointF(_startPosX + _airplaneWidth * 0.1f, _startPosY + _airplaneHeight * 0.45f), new PointF(_startPosX + _airplaneWidth * 0.1f, _startPosY + _airplaneHeight * 0.55f)}); - g.DrawPolygon(pen, new PointF[6] { new PointF(_startPosX + _airplaneWidth*0.45f,_startPosY), - new PointF(_startPosX + _airplaneWidth*0.50f,_startPosY), + g.FillPolygon(brush, new PointF[6] { new PointF(_startPosX + _airplaneWidth*0.45f,_startPosY), + new PointF(_startPosX + _airplaneWidth * 0.50f,_startPosY), new PointF(_startPosX + _airplaneWidth * 0.60f, _startPosY+_airplaneHeight*0.45f) , new PointF(_startPosX + _airplaneWidth * 0.60f, _startPosY+ _airplaneHeight*0.55f), new PointF(_startPosX + _airplaneWidth * 0.50f,_startPosY + _airplaneHeight), new PointF(_startPosX + _airplaneWidth * 0.45f,_startPosY + _airplaneHeight)}); - g.DrawPolygon(pen, new PointF[4] { + g.FillPolygon(brush, new PointF[4] { new PointF(_startPosX + _airplaneWidth, _startPosY + _airplaneHeight*0.20f), new PointF(_startPosX + _airplaneWidth*0.85f,_startPosY+_airplaneHeight*0.35f), new PointF(_startPosX + _airplaneWidth * 0.85f,_startPosY + _airplaneHeight*0.65f), new PointF(_startPosX + _airplaneWidth, _startPosY + _airplaneHeight*0.80f) }); - g.FillRectangle(new SolidBrush(Color.White), _startPosX + _airplaneWidth * 0.1f, _startPosY + _airplaneHeight * 0.45f, _airplaneWidth * 0.9f, _airplaneHeight * 0.1f); + g.FillRectangle(brush, _startPosX + _airplaneWidth * 0.1f, _startPosY + _airplaneHeight * 0.45f, _airplaneWidth * 0.9f, _airplaneHeight * 0.1f); + g.DrawRectangle(pen, _startPosX + _airplaneWidth * 0.1f, _startPosY + _airplaneHeight * 0.45f, _airplaneWidth * 0.9f, _airplaneHeight * 0.1f); } public void ChangeBorders(int width, int height) diff --git a/Stormtrooper/Stormtrooper/DrawningStormtrooper.cs b/Stormtrooper/Stormtrooper/DrawningStormtrooper.cs new file mode 100644 index 0000000..26f08dd --- /dev/null +++ b/Stormtrooper/Stormtrooper/DrawningStormtrooper.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Stormtrooper +{ + internal class DrawningStormtrooper : DrawningMilitaryAirplane + { + public DrawningStormtrooper(int speed, int weight, int crew, Color advColor, bool rockets, bool boosters, bool radar) : base(speed, weight) + { + Airplane = new EntityStormtrooper(speed, weight,crew, advColor, rockets, boosters, radar); + } + public override void DrawAirplane(Graphics g) + { + + if (Airplane is not EntityStormtrooper stormtrooper) + { + return; + } + + Pen pen = new Pen(stormtrooper.AdvColor); + Brush brush = new SolidBrush(stormtrooper.AdvColor); + if (stormtrooper.Rockets) + { + g.FillEllipse(brush,_startPosX + _airplaneWidth * 0.3f,_startPosY + _airplaneHeight * 0.2f,_airplaneWidth * 0.3f,_airplaneHeight * 0.03f); + g.FillEllipse(brush,_startPosX + _airplaneWidth * 0.3f,_startPosY + _airplaneHeight * 0.3f, _airplaneWidth * 0.3f, _airplaneHeight * 0.03f); + g.FillEllipse(brush,_startPosX + _airplaneWidth * 0.3f,_startPosY + _airplaneHeight * 0.7f, _airplaneWidth * 0.3f, _airplaneHeight * 0.03f); + g.FillEllipse(brush,_startPosX + _airplaneWidth * 0.3f,_startPosY + _airplaneHeight * 0.8f, _airplaneWidth * 0.3f, _airplaneHeight * 0.03f); + + } + base.DrawAirplane(g); + + if (stormtrooper.Booster) + { + g.FillRectangle(brush, _startPosX + _airplaneWidth * 0.95f, _startPosY + _airplaneHeight * 0.35f, _airplaneWidth * 0.055f, _airplaneHeight * 0.03f); + g.FillRectangle(brush, _startPosX + _airplaneWidth * 0.95f, _startPosY + _airplaneHeight * 0.63f, _airplaneWidth * 0.055f, _airplaneHeight * 0.03f); + } + + if (stormtrooper.Radar) + { + g.FillEllipse(brush, _startPosX + _airplaneWidth * 0.1f, _startPosY + _airplaneHeight * 0.45f, _airplaneWidth*0.125f, _airplaneHeight * 0.1f); + } + + } + } +} diff --git a/Stormtrooper/Stormtrooper/EntityMilitaryAirplane.cs b/Stormtrooper/Stormtrooper/EntityMilitaryAirplane.cs index a5cd2f6..d7aa97e 100644 --- a/Stormtrooper/Stormtrooper/EntityMilitaryAirplane.cs +++ b/Stormtrooper/Stormtrooper/EntityMilitaryAirplane.cs @@ -14,7 +14,7 @@ namespace Stormtrooper public float Step => Speed * 25 / Weight; - public void Init(int speed, int weight, int crew = 10) + public EntityMilitaryAirplane(int speed, int weight, int crew = 10) { Random random = new Random(); Speed = speed <= 0 ? random.Next(10, 100) : speed; diff --git a/Stormtrooper/Stormtrooper/EntityStormtrooper.cs b/Stormtrooper/Stormtrooper/EntityStormtrooper.cs new file mode 100644 index 0000000..4907b8b --- /dev/null +++ b/Stormtrooper/Stormtrooper/EntityStormtrooper.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Stormtrooper +{ + internal class EntityStormtrooper : EntityMilitaryAirplane + { + /// + /// Доп цвет + /// + public Color AdvColor { get;private set; } + /// + /// Наличие рокет + /// + public bool Rockets { get; private set; } + /// + /// Наличие ускорителей + /// + public bool Booster { get; private set; } + /// + /// Наличие радара + /// + public bool Radar { get; private set; } + + public EntityStormtrooper(int speed, int weight, int crew, Color advColor, bool rockets, bool boosters, bool radar) + : base(speed, weight, crew) + { + Rockets = rockets; + Booster = boosters; + Radar = radar; + AdvColor = advColor; + + } + + } +} diff --git a/Stormtrooper/Stormtrooper/MainForm.Designer.cs b/Stormtrooper/Stormtrooper/MainForm.Designer.cs index f1c0093..e8d1930 100644 --- a/Stormtrooper/Stormtrooper/MainForm.Designer.cs +++ b/Stormtrooper/Stormtrooper/MainForm.Designer.cs @@ -39,6 +39,7 @@ namespace Stormtrooper this.buttonDown = new System.Windows.Forms.Button(); this.buttonLeft = new System.Windows.Forms.Button(); this.buttonRight = new System.Windows.Forms.Button(); + this.buttonCreateMod = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirplane)).BeginInit(); this.toolStripStatus.SuspendLayout(); this.SuspendLayout(); @@ -49,7 +50,8 @@ namespace Stormtrooper | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.pictureBoxAirplane.BackColor = System.Drawing.Color.White; - this.pictureBoxAirplane.Location = new System.Drawing.Point(12, 12); + this.pictureBoxAirplane.Location = new System.Drawing.Point(14, 14); + this.pictureBoxAirplane.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.pictureBoxAirplane.Name = "pictureBoxAirplane"; this.pictureBoxAirplane.Size = new System.Drawing.Size(1127, 558); this.pictureBoxAirplane.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -61,9 +63,10 @@ namespace Stormtrooper // this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.buttonCreate.Cursor = System.Windows.Forms.Cursors.Hand; - this.buttonCreate.Location = new System.Drawing.Point(27, 518); + this.buttonCreate.Location = new System.Drawing.Point(31, 598); + this.buttonCreate.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.buttonCreate.Name = "buttonCreate"; - this.buttonCreate.Size = new System.Drawing.Size(75, 23); + this.buttonCreate.Size = new System.Drawing.Size(88, 27); this.buttonCreate.TabIndex = 1; this.buttonCreate.Text = "Создать"; this.buttonCreate.UseVisualStyleBackColor = true; @@ -76,9 +79,9 @@ namespace Stormtrooper this.toolStripLabelSpeed, this.toolStripLabelWeight, this.toolStripLabelCrew}); - this.toolStripStatus.Location = new System.Drawing.Point(0, 584); + this.toolStripStatus.Location = new System.Drawing.Point(0, 678); this.toolStripStatus.Name = "toolStripStatus"; - this.toolStripStatus.Size = new System.Drawing.Size(1151, 25); + this.toolStripStatus.Size = new System.Drawing.Size(1343, 25); this.toolStripStatus.TabIndex = 2; this.toolStripStatus.Text = "toolStrip1"; // @@ -103,9 +106,10 @@ namespace Stormtrooper // buttonUp // this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonUp.Location = new System.Drawing.Point(1031, 482); + this.buttonUp.Location = new System.Drawing.Point(1203, 556); + this.buttonUp.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.buttonUp.Name = "buttonUp"; - this.buttonUp.Size = new System.Drawing.Size(30, 30); + this.buttonUp.Size = new System.Drawing.Size(35, 35); this.buttonUp.TabIndex = 3; this.buttonUp.UseVisualStyleBackColor = true; this.buttonUp.Click += new System.EventHandler(this.buttonMove_Click); @@ -113,9 +117,10 @@ namespace Stormtrooper // buttonDown // this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonDown.Location = new System.Drawing.Point(1031, 518); + this.buttonDown.Location = new System.Drawing.Point(1203, 598); + this.buttonDown.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.buttonDown.Name = "buttonDown"; - this.buttonDown.Size = new System.Drawing.Size(30, 30); + this.buttonDown.Size = new System.Drawing.Size(35, 35); this.buttonDown.TabIndex = 4; this.buttonDown.UseVisualStyleBackColor = true; this.buttonDown.Click += new System.EventHandler(this.buttonMove_Click); @@ -123,9 +128,10 @@ namespace Stormtrooper // buttonLeft // this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonLeft.Location = new System.Drawing.Point(995, 517); + this.buttonLeft.Location = new System.Drawing.Point(1161, 597); + this.buttonLeft.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.buttonLeft.Name = "buttonLeft"; - this.buttonLeft.Size = new System.Drawing.Size(30, 30); + this.buttonLeft.Size = new System.Drawing.Size(35, 35); this.buttonLeft.TabIndex = 5; this.buttonLeft.UseVisualStyleBackColor = true; this.buttonLeft.Click += new System.EventHandler(this.buttonMove_Click); @@ -133,18 +139,30 @@ namespace Stormtrooper // buttonRight // this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonRight.Location = new System.Drawing.Point(1067, 517); + this.buttonRight.Location = new System.Drawing.Point(1245, 597); + this.buttonRight.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.buttonRight.Name = "buttonRight"; - this.buttonRight.Size = new System.Drawing.Size(30, 30); + this.buttonRight.Size = new System.Drawing.Size(35, 35); this.buttonRight.TabIndex = 6; this.buttonRight.UseVisualStyleBackColor = true; this.buttonRight.Click += new System.EventHandler(this.buttonMove_Click); // + // buttonCreateMod + // + this.buttonCreateMod.Location = new System.Drawing.Point(162, 598); + this.buttonCreateMod.Name = "buttonCreateMod"; + this.buttonCreateMod.Size = new System.Drawing.Size(104, 27); + this.buttonCreateMod.TabIndex = 7; + this.buttonCreateMod.Text = "Модификация"; + this.buttonCreateMod.UseVisualStyleBackColor = true; + this.buttonCreateMod.Click += new System.EventHandler(this.buttonCreateMod_Click); + // // MainForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1151, 609); + this.ClientSize = new System.Drawing.Size(1343, 703); + this.Controls.Add(this.buttonCreateMod); this.Controls.Add(this.buttonRight); this.Controls.Add(this.buttonLeft); this.Controls.Add(this.buttonDown); @@ -152,6 +170,7 @@ namespace Stormtrooper this.Controls.Add(this.toolStripStatus); this.Controls.Add(this.buttonCreate); this.Controls.Add(this.pictureBoxAirplane); + this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.Name = "MainForm"; this.Text = "Form1"; ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirplane)).EndInit(); @@ -174,6 +193,7 @@ namespace Stormtrooper private System.Windows.Forms.Button buttonDown; private System.Windows.Forms.Button buttonLeft; private System.Windows.Forms.Button buttonRight; + private Button buttonCreateMod; } } diff --git a/Stormtrooper/Stormtrooper/MainForm.cs b/Stormtrooper/Stormtrooper/MainForm.cs index 2e5d714..ee5ad95 100644 --- a/Stormtrooper/Stormtrooper/MainForm.cs +++ b/Stormtrooper/Stormtrooper/MainForm.cs @@ -29,12 +29,9 @@ namespace Stormtrooper private void buttonCreate_Click(object sender, EventArgs e) { Random random = new Random(); - _airplane = new DrawningMilitaryAirplane(); - _airplane.Init(10, 50); + _airplane = new DrawningMilitaryAirplane(10, 50); _airplane.SetPosition(random.Next(100,150), random.Next(100,150), pictureBoxAirplane.Width, pictureBoxAirplane.Height); - toolStripLabelSpeed.Text = $"Скорость: {_airplane.Airplane.Speed}"; - toolStripLabelWeight.Text = $"Вес: {_airplane.Airplane.Weight}"; - toolStripLabelCrew.Text = $"Экипаж: {_airplane.Airplane.Crew}"; + SetData(); Draw(); } @@ -65,5 +62,23 @@ namespace Stormtrooper } Draw(); } + private void SetData() + { + toolStripLabelSpeed.Text = $"Скорость: {_airplane.Airplane.Speed}"; + toolStripLabelWeight.Text = $"Вес: {_airplane.Airplane.Weight}"; + toolStripLabelCrew.Text = $"Экипаж: {_airplane.Airplane.Crew}"; + } + + private void buttonCreateMod_Click(object sender, EventArgs e) + { + + Random random = new Random(); + _airplane = new DrawningStormtrooper(random.Next(10,100),random.Next(50,250),random.Next(1,100), + Color.FromArgb(random.Next(0,256), random.Next(0, 256), random.Next(0, 256)), + Convert.ToBoolean(random.Next(0,2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); + _airplane.SetPosition(random.Next(100, 150), random.Next(100, 150), pictureBoxAirplane.Width, pictureBoxAirplane.Height); + SetData(); + Draw(); + } } } diff --git a/Stormtrooper/Stormtrooper/MainForm.resx b/Stormtrooper/Stormtrooper/MainForm.resx index 66a7586..f799d08 100644 --- a/Stormtrooper/Stormtrooper/MainForm.resx +++ b/Stormtrooper/Stormtrooper/MainForm.resx @@ -1,64 +1,4 @@ - - - + From 987d1fafa8319a52954ef545f87a35ff339aad3a Mon Sep 17 00:00:00 2001 From: ker73rus Date: Tue, 1 Nov 2022 02:55:40 +0400 Subject: [PATCH 2/3] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BA=D0=BE=D0=BB=D0=BB=D0=B8=D0=B7=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Stormtrooper/Stormtrooper/AbstractMap.cs | 151 +++++++++++++ Stormtrooper/Stormtrooper/Direction.cs | 1 + .../Stormtrooper/DrawningMilitaryAirplane.cs | 20 +- Stormtrooper/Stormtrooper/DrawningObject.cs | 40 ++++ Stormtrooper/Stormtrooper/FormMap.Designer.cs | 212 ++++++++++++++++++ Stormtrooper/Stormtrooper/FormMap.cs | 91 ++++++++ Stormtrooper/Stormtrooper/FormMap.resx | 66 ++++++ Stormtrooper/Stormtrooper/IDrawningObject.cs | 40 ++++ Stormtrooper/Stormtrooper/Program.cs | 2 +- Stormtrooper/Stormtrooper/SimpleMap.cs | 50 +++++ Stormtrooper/Stormtrooper/Stormtrooper.csproj | 6 + 11 files changed, 661 insertions(+), 18 deletions(-) create mode 100644 Stormtrooper/Stormtrooper/AbstractMap.cs create mode 100644 Stormtrooper/Stormtrooper/DrawningObject.cs create mode 100644 Stormtrooper/Stormtrooper/FormMap.Designer.cs create mode 100644 Stormtrooper/Stormtrooper/FormMap.cs create mode 100644 Stormtrooper/Stormtrooper/FormMap.resx create mode 100644 Stormtrooper/Stormtrooper/IDrawningObject.cs create mode 100644 Stormtrooper/Stormtrooper/SimpleMap.cs diff --git a/Stormtrooper/Stormtrooper/AbstractMap.cs b/Stormtrooper/Stormtrooper/AbstractMap.cs new file mode 100644 index 0000000..28d28ad --- /dev/null +++ b/Stormtrooper/Stormtrooper/AbstractMap.cs @@ -0,0 +1,151 @@ +using Stormtrooper; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Cars +{ + 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) + { + if (CheckCollision(direction)) + { + _drawningObject.MoveObject(direction); + } + return DrawMapWithObject(); + } + private bool SetObjectOnMap() + { + if (_drawningObject == null || _map == null) + { + return false; + } + int x = _random.Next(0, (int)(_width * 0.9f)); + int y = _random.Next(0, (int)(_height * 0.8f)); + _drawningObject.SetObject(x, y, _width, _height); + + while (!CheckCollision(Direction.None)) + { + x = _random.Next(0, (int)(_width * 0.9f)); + y = _random.Next(0, (int)(_height * 0.8f)); + _drawningObject.SetObject(x, y, _width, _height); + } + return true; + } + + private bool CheckCollision(Direction dir) + { + int left = (int)(_drawningObject.GetCurrentPosition().Left / _size_x); + int top = (int)(_drawningObject.GetCurrentPosition().Top / _size_y); + int bottom = (int)(_drawningObject.GetCurrentPosition().Bottom / _size_y) +1; + int right = (int)(_drawningObject.GetCurrentPosition().Right / _size_x) +1; + switch (dir) + { + case Direction.None: + break; + case Direction.Left: + if (left >= 1) + { + left--; + right--; + } + else return false; + break; + case Direction.Up: + if (top >= 1) + { + top--; + bottom--; + } + else return false; + + break; + case Direction.Down: + if (bottom <= 98) + { + top++; + bottom++; + } + else return false; + break; + case Direction.Right: + if (right <= 98) + { + left++; + right++; + } + else return false; + break; + } + + for (int i = left; i < right; i++) + { + for (int j = top; j < bottom; j++) + { + if (_map[i, j] == _barrier) + { + 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.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); + } +} \ No newline at end of file diff --git a/Stormtrooper/Stormtrooper/Direction.cs b/Stormtrooper/Stormtrooper/Direction.cs index bc5cbbe..f4826fe 100644 --- a/Stormtrooper/Stormtrooper/Direction.cs +++ b/Stormtrooper/Stormtrooper/Direction.cs @@ -9,6 +9,7 @@ namespace Stormtrooper internal enum Direction { + None, Up, Down, Left, diff --git a/Stormtrooper/Stormtrooper/DrawningMilitaryAirplane.cs b/Stormtrooper/Stormtrooper/DrawningMilitaryAirplane.cs index 13ba0cd..ac03b92 100644 --- a/Stormtrooper/Stormtrooper/DrawningMilitaryAirplane.cs +++ b/Stormtrooper/Stormtrooper/DrawningMilitaryAirplane.cs @@ -130,24 +130,10 @@ namespace Stormtrooper g.DrawRectangle(pen, _startPosX + _airplaneWidth * 0.1f, _startPosY + _airplaneHeight * 0.45f, _airplaneWidth * 0.9f, _airplaneHeight * 0.1f); } - public void ChangeBorders(int width, int height) + + public (float Left, float Top, float Right, float Bottom) GetCurrentPosition() { - _pictureWidth = width; - _pictureHeight = height; - if (_pictureWidth <= _airplaneWidth || _pictureHeight <= _airplaneHeight) - { - _pictureWidth = null; - _pictureHeight = null; - return; - } - if (_startPosX + _airplaneWidth > _pictureWidth) - { - _startPosX = _pictureWidth.Value - _airplaneWidth; - } - if (_startPosY + _airplaneHeight > _pictureHeight) - { - _startPosY = _pictureHeight.Value - _airplaneHeight; - } + return (_startPosX, _startPosY, _startPosX + _airplaneWidth, _startPosY + _airplaneHeight); } } } diff --git a/Stormtrooper/Stormtrooper/DrawningObject.cs b/Stormtrooper/Stormtrooper/DrawningObject.cs new file mode 100644 index 0000000..13841e1 --- /dev/null +++ b/Stormtrooper/Stormtrooper/DrawningObject.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Stormtrooper +{ + internal class DrawningObject : IDrawningObject + { + private DrawningMilitaryAirplane _airplane; + + public DrawningObject(DrawningMilitaryAirplane airplane) + { + _airplane = airplane; + } + + public float Step => _airplane?.Airplane?.Step ?? 0; + + public (float Left, float Top, float Right, float Bottom) GetCurrentPosition() + { + return _airplane?.GetCurrentPosition() ?? default; + } + + public void MoveObject(Direction direction) + { + _airplane?.MoveAirplane(direction); + } + + public void SetObject(int x, int y, int width, int height) + { + _airplane?.SetPosition(x, y, width, height); + } + + void IDrawningObject.DrawningObject(Graphics g) + { + _airplane.DrawAirplane(g); + } + } +} diff --git a/Stormtrooper/Stormtrooper/FormMap.Designer.cs b/Stormtrooper/Stormtrooper/FormMap.Designer.cs new file mode 100644 index 0000000..bb7609b --- /dev/null +++ b/Stormtrooper/Stormtrooper/FormMap.Designer.cs @@ -0,0 +1,212 @@ + +namespace Stormtrooper +{ + partial class FormMap + { + /// + /// Обязательная переменная конструктора. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Освободить все используемые ресурсы. + /// + /// истинно, если управляемый ресурс должен быть удален; иначе ложно. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Код, автоматически созданный конструктором форм Windows + + /// + /// Требуемый метод для поддержки конструктора — не изменяйте + /// содержимое этого метода с помощью редактора кода. + /// + private void InitializeComponent() + { + this.pictureBoxAirplane = new System.Windows.Forms.PictureBox(); + this.buttonCreate = new System.Windows.Forms.Button(); + this.toolStripStatus = new System.Windows.Forms.ToolStrip(); + this.toolStripLabelSpeed = new System.Windows.Forms.ToolStripLabel(); + this.toolStripLabelWeight = new System.Windows.Forms.ToolStripLabel(); + this.toolStripLabelCrew = new System.Windows.Forms.ToolStripLabel(); + 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.buttonCreateMod = new System.Windows.Forms.Button(); + this.comboBoxMapSelector = new System.Windows.Forms.ComboBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirplane)).BeginInit(); + this.toolStripStatus.SuspendLayout(); + this.SuspendLayout(); + // + // pictureBoxAirplane + // + this.pictureBoxAirplane.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.pictureBoxAirplane.BackColor = System.Drawing.Color.White; + this.pictureBoxAirplane.Location = new System.Drawing.Point(14, 14); + this.pictureBoxAirplane.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.pictureBoxAirplane.Name = "pictureBoxAirplane"; + this.pictureBoxAirplane.Size = new System.Drawing.Size(1127, 558); + this.pictureBoxAirplane.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBoxAirplane.TabIndex = 0; + this.pictureBoxAirplane.TabStop = false; + // + // buttonCreate + // + this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreate.Cursor = System.Windows.Forms.Cursors.Hand; + this.buttonCreate.Location = new System.Drawing.Point(31, 598); + this.buttonCreate.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonCreate.Name = "buttonCreate"; + this.buttonCreate.Size = new System.Drawing.Size(88, 27); + this.buttonCreate.TabIndex = 1; + this.buttonCreate.Text = "Создать"; + this.buttonCreate.UseVisualStyleBackColor = true; + this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click); + // + // toolStripStatus + // + this.toolStripStatus.Dock = System.Windows.Forms.DockStyle.Bottom; + this.toolStripStatus.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripLabelSpeed, + this.toolStripLabelWeight, + this.toolStripLabelCrew}); + this.toolStripStatus.Location = new System.Drawing.Point(0, 678); + this.toolStripStatus.Name = "toolStripStatus"; + this.toolStripStatus.Size = new System.Drawing.Size(1343, 25); + this.toolStripStatus.TabIndex = 2; + this.toolStripStatus.Text = "toolStrip1"; + // + // toolStripLabelSpeed + // + this.toolStripLabelSpeed.Name = "toolStripLabelSpeed"; + this.toolStripLabelSpeed.Size = new System.Drawing.Size(86, 22); + this.toolStripLabelSpeed.Text = "toolStripLabel1"; + // + // toolStripLabelWeight + // + this.toolStripLabelWeight.Name = "toolStripLabelWeight"; + this.toolStripLabelWeight.Size = new System.Drawing.Size(86, 22); + this.toolStripLabelWeight.Text = "toolStripLabel2"; + // + // toolStripLabelCrew + // + this.toolStripLabelCrew.Name = "toolStripLabelCrew"; + this.toolStripLabelCrew.Size = new System.Drawing.Size(86, 22); + this.toolStripLabelCrew.Text = "toolStripLabel3"; + // + // buttonUp + // + this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonUp.Location = new System.Drawing.Point(1203, 556); + this.buttonUp.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(35, 35); + 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.Location = new System.Drawing.Point(1203, 598); + this.buttonDown.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(35, 35); + 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.Location = new System.Drawing.Point(1161, 597); + this.buttonLeft.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(35, 35); + 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.Location = new System.Drawing.Point(1245, 597); + this.buttonRight.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(35, 35); + this.buttonRight.TabIndex = 6; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.Click += new System.EventHandler(this.buttonMove_Click); + // + // buttonCreateMod + // + this.buttonCreateMod.Location = new System.Drawing.Point(162, 598); + this.buttonCreateMod.Name = "buttonCreateMod"; + this.buttonCreateMod.Size = new System.Drawing.Size(104, 27); + this.buttonCreateMod.TabIndex = 7; + this.buttonCreateMod.Text = "Модификация"; + this.buttonCreateMod.UseVisualStyleBackColor = true; + this.buttonCreateMod.Click += new System.EventHandler(this.buttonCreateMod_Click); + // + // comboBoxMapSelector + // + this.comboBoxMapSelector.FormattingEnabled = true; + this.comboBoxMapSelector.Items.AddRange(new object[] { + "Простая карта"}); + this.comboBoxMapSelector.Location = new System.Drawing.Point(31, 27); + this.comboBoxMapSelector.Name = "comboBoxMapSelector"; + this.comboBoxMapSelector.Size = new System.Drawing.Size(117, 23); + this.comboBoxMapSelector.TabIndex = 8; + this.comboBoxMapSelector.SelectedIndexChanged += new System.EventHandler(this.comboBoxMapSelector_SelectedIndexChanged); + // + // FormMap + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1343, 703); + this.Controls.Add(this.comboBoxMapSelector); + this.Controls.Add(this.buttonCreateMod); + this.Controls.Add(this.buttonRight); + this.Controls.Add(this.buttonLeft); + this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonUp); + this.Controls.Add(this.toolStripStatus); + this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.pictureBoxAirplane); + this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.Name = "FormMap"; + this.Text = "Form1"; + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirplane)).EndInit(); + this.toolStripStatus.ResumeLayout(false); + this.toolStripStatus.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.PictureBox pictureBoxAirplane; + private System.Windows.Forms.Button buttonCreate; + private System.Windows.Forms.ToolStrip toolStripStatus; + private System.Windows.Forms.ToolStripLabel toolStripLabelSpeed; + private System.Windows.Forms.ToolStripLabel toolStripLabelWeight; + private System.Windows.Forms.ToolStripLabel toolStripLabelCrew; + private System.Windows.Forms.Button buttonUp; + private System.Windows.Forms.Button buttonDown; + private System.Windows.Forms.Button buttonLeft; + private System.Windows.Forms.Button buttonRight; + private Button buttonCreateMod; + private ComboBox comboBoxMapSelector; + } +} + diff --git a/Stormtrooper/Stormtrooper/FormMap.cs b/Stormtrooper/Stormtrooper/FormMap.cs new file mode 100644 index 0000000..0719afe --- /dev/null +++ b/Stormtrooper/Stormtrooper/FormMap.cs @@ -0,0 +1,91 @@ +using Cars; +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 Stormtrooper +{ + public partial class FormMap : Form + { + DrawningMilitaryAirplane _airplane; + AbstractMap _abstractMap; + public FormMap() + { + InitializeComponent(); + _abstractMap = new SimpleMap(); + } + private void Draw() + { + Bitmap bmp = new Bitmap (pictureBoxAirplane.Width, pictureBoxAirplane.Height); + Graphics gr = Graphics.FromImage(bmp); + _airplane?.DrawAirplane(gr); + pictureBoxAirplane.Image = bmp; + } + private void buttonCreate_Click(object sender, EventArgs e) + { + Random random = new Random(); + _airplane = new DrawningMilitaryAirplane(10, 50); + _airplane.SetPosition(random.Next(100,150), random.Next(100,150), pictureBoxAirplane.Width, pictureBoxAirplane.Height); + SetData(); + Draw(); + } + + 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; + } + pictureBoxAirplane.Image = _abstractMap?.MoveObject(dir); + } + private void SetData() + { + toolStripLabelSpeed.Text = $"Скорость: {_airplane.Airplane.Speed}"; + toolStripLabelWeight.Text = $"Вес: {_airplane.Airplane.Weight}"; + toolStripLabelCrew.Text = $"Экипаж: {_airplane.Airplane.Crew}"; + pictureBoxAirplane.Image = _abstractMap.CreateMap(pictureBoxAirplane.Width, pictureBoxAirplane.Height, + new DrawningObject(_airplane)); + } + + private void buttonCreateMod_Click(object sender, EventArgs e) + { + + Random random = new Random(); + _airplane = new DrawningStormtrooper(random.Next(10,100),random.Next(50,250),random.Next(1,100), + Color.FromArgb(random.Next(0,256), random.Next(0, 256), random.Next(0, 256)), + Convert.ToBoolean(random.Next(0,2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); + _airplane.SetPosition(random.Next(100, 150), random.Next(100, 150), pictureBoxAirplane.Width, pictureBoxAirplane.Height); + SetData(); + } + + private void comboBoxMapSelector_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxMapSelector.Text) + { + case "Простая карта": + _abstractMap = new SimpleMap(); + break; + } + } + } +} diff --git a/Stormtrooper/Stormtrooper/FormMap.resx b/Stormtrooper/Stormtrooper/FormMap.resx new file mode 100644 index 0000000..6eea15f --- /dev/null +++ b/Stormtrooper/Stormtrooper/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 + + + 25 + + \ No newline at end of file diff --git a/Stormtrooper/Stormtrooper/IDrawningObject.cs b/Stormtrooper/Stormtrooper/IDrawningObject.cs new file mode 100644 index 0000000..08ef54e --- /dev/null +++ b/Stormtrooper/Stormtrooper/IDrawningObject.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Stormtrooper +{ + 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 Top, float Right, float Bottom) GetCurrentPosition(); + } +} diff --git a/Stormtrooper/Stormtrooper/Program.cs b/Stormtrooper/Stormtrooper/Program.cs index 2637065..63f467d 100644 --- a/Stormtrooper/Stormtrooper/Program.cs +++ b/Stormtrooper/Stormtrooper/Program.cs @@ -16,7 +16,7 @@ namespace Stormtrooper { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new MainForm()); + Application.Run(new FormMap()); } } } diff --git a/Stormtrooper/Stormtrooper/SimpleMap.cs b/Stormtrooper/Stormtrooper/SimpleMap.cs new file mode 100644 index 0000000..82d90fb --- /dev/null +++ b/Stormtrooper/Stormtrooper/SimpleMap.cs @@ -0,0 +1,50 @@ +namespace Cars +{ + /// + /// Простая реализация абсрактного класса AbstractMap + /// + 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, (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 < 100) + { + int x = _random.Next(0, 100); + int y = _random.Next(0, 100); + if (_map[x, y] == _freeRoad) + { + _map[x, y] = _barrier; + counter++; + } + } + } + } +} \ No newline at end of file diff --git a/Stormtrooper/Stormtrooper/Stormtrooper.csproj b/Stormtrooper/Stormtrooper/Stormtrooper.csproj index b57c89e..9ee8484 100644 --- a/Stormtrooper/Stormtrooper/Stormtrooper.csproj +++ b/Stormtrooper/Stormtrooper/Stormtrooper.csproj @@ -8,4 +8,10 @@ enable + + + Form + + + \ No newline at end of file From 8c5bb5b4a4e9ef17d85fb9b7bb9330b463662257 Mon Sep 17 00:00:00 2001 From: ker73rus Date: Tue, 1 Nov 2022 03:30:37 +0400 Subject: [PATCH 3/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B5=20=D0=BA=D0=B0?= =?UTF-8?q?=D1=80=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Stormtrooper/Stormtrooper/CloudMap.cs | 61 +++++++++++++++++++ Stormtrooper/Stormtrooper/DangerMap.cs | 52 ++++++++++++++++ .../Stormtrooper/DrawningMilitaryAirplane.cs | 19 ++++++ Stormtrooper/Stormtrooper/FormMap.Designer.cs | 4 +- Stormtrooper/Stormtrooper/FormMap.cs | 14 ++--- 5 files changed, 141 insertions(+), 9 deletions(-) create mode 100644 Stormtrooper/Stormtrooper/CloudMap.cs create mode 100644 Stormtrooper/Stormtrooper/DangerMap.cs diff --git a/Stormtrooper/Stormtrooper/CloudMap.cs b/Stormtrooper/Stormtrooper/CloudMap.cs new file mode 100644 index 0000000..c4c8170 --- /dev/null +++ b/Stormtrooper/Stormtrooper/CloudMap.cs @@ -0,0 +1,61 @@ +using Cars; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Stormtrooper +{ + internal class CloudMap: AbstractMap + { + private readonly Brush barrierColor = new SolidBrush(Color.Gray); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.White); + + 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); + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + _map[i, j] = _freeRoad; + } + } + + for (int c = _random.Next(1, 5); c > 0; c--) + { + int i = _random.Next(0, 100); + int j = _random.Next(0, 100); + int wight = _random.Next(0, Math.Min(100 - j, j)); + int height = _random.Next(0, Math.Min(100 - i,i)); + + for (int k = 0; k <= wight; k++, height--) + { + for(int l = 0; l <= height; l++) + { + _map[i + l, j + k] = _barrier; + _map[i -l, j - k] = _barrier; + _map[i - l, j + k] = _barrier; + _map[i + l, j - k] = _barrier; + } + } + } + + } + } +} + diff --git a/Stormtrooper/Stormtrooper/DangerMap.cs b/Stormtrooper/Stormtrooper/DangerMap.cs new file mode 100644 index 0000000..31dc977 --- /dev/null +++ b/Stormtrooper/Stormtrooper/DangerMap.cs @@ -0,0 +1,52 @@ +using Cars; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Stormtrooper +{ + internal class DangerMap : AbstractMap + { + private readonly Brush barrierColor = new SolidBrush(Color.Red); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.Black); + + 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); + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + _map[i, j] = _freeRoad; + } + } + + for(int c = _random.Next(1, 10); c > 0; c--) + { + int i = _random.Next(0, 100); + int maxj = _random.Next(30, 70); + for (int j = 0; j < maxj; j++) + { + _map[i, j] = _barrier; + } + + } + + } + } +} diff --git a/Stormtrooper/Stormtrooper/DrawningMilitaryAirplane.cs b/Stormtrooper/Stormtrooper/DrawningMilitaryAirplane.cs index ac03b92..a59af2b 100644 --- a/Stormtrooper/Stormtrooper/DrawningMilitaryAirplane.cs +++ b/Stormtrooper/Stormtrooper/DrawningMilitaryAirplane.cs @@ -130,6 +130,25 @@ namespace Stormtrooper g.DrawRectangle(pen, _startPosX + _airplaneWidth * 0.1f, _startPosY + _airplaneHeight * 0.45f, _airplaneWidth * 0.9f, _airplaneHeight * 0.1f); } + public void ChangeBorders(int width, int height) + { + _pictureWidth = width; + _pictureHeight = height; + if (_pictureWidth <= _airplaneWidth || _pictureHeight <= _airplaneHeight) + { + _pictureWidth = null; + _pictureHeight = null; + return; + } + if (_startPosX + _airplaneWidth > _pictureWidth) + { + _startPosX = _pictureWidth.Value - _airplaneWidth; + } + if (_startPosY + _airplaneHeight > _pictureHeight) + { + _startPosY = _pictureHeight.Value - _airplaneHeight; + } + } public (float Left, float Top, float Right, float Bottom) GetCurrentPosition() { diff --git a/Stormtrooper/Stormtrooper/FormMap.Designer.cs b/Stormtrooper/Stormtrooper/FormMap.Designer.cs index bb7609b..8c0b1d0 100644 --- a/Stormtrooper/Stormtrooper/FormMap.Designer.cs +++ b/Stormtrooper/Stormtrooper/FormMap.Designer.cs @@ -161,7 +161,9 @@ namespace Stormtrooper // this.comboBoxMapSelector.FormattingEnabled = true; this.comboBoxMapSelector.Items.AddRange(new object[] { - "Простая карта"}); + "Простая карта", + "Опасная карта", + "Облачная карта"}); this.comboBoxMapSelector.Location = new System.Drawing.Point(31, 27); this.comboBoxMapSelector.Name = "comboBoxMapSelector"; this.comboBoxMapSelector.Size = new System.Drawing.Size(117, 23); diff --git a/Stormtrooper/Stormtrooper/FormMap.cs b/Stormtrooper/Stormtrooper/FormMap.cs index 0719afe..ce5dca7 100644 --- a/Stormtrooper/Stormtrooper/FormMap.cs +++ b/Stormtrooper/Stormtrooper/FormMap.cs @@ -20,20 +20,12 @@ namespace Stormtrooper InitializeComponent(); _abstractMap = new SimpleMap(); } - private void Draw() - { - Bitmap bmp = new Bitmap (pictureBoxAirplane.Width, pictureBoxAirplane.Height); - Graphics gr = Graphics.FromImage(bmp); - _airplane?.DrawAirplane(gr); - pictureBoxAirplane.Image = bmp; - } private void buttonCreate_Click(object sender, EventArgs e) { Random random = new Random(); _airplane = new DrawningMilitaryAirplane(10, 50); _airplane.SetPosition(random.Next(100,150), random.Next(100,150), pictureBoxAirplane.Width, pictureBoxAirplane.Height); SetData(); - Draw(); } private void buttonMove_Click(object sender,EventArgs e) @@ -85,6 +77,12 @@ namespace Stormtrooper case "Простая карта": _abstractMap = new SimpleMap(); break; + case "Опасная карта": + _abstractMap = new DangerMap(); + break; + case "Облачная карта": + _abstractMap = new CloudMap(); + break; } } }