diff --git a/AntiAircraftGun/AntiAircraftGun/AbstractMap.cs b/AntiAircraftGun/AntiAircraftGun/AbstractMap.cs new file mode 100644 index 0000000..553ef44 --- /dev/null +++ b/AntiAircraftGun/AntiAircraftGun/AbstractMap.cs @@ -0,0 +1,157 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AntiAircraftGun +{ + internal abstract class AbstractMap + { + private IDrawingObject _drawingObject = null; + protected int[,] _map = null; + protected int _width; + protected int _height; + protected float _size_x; + protected float _size_y; + protected readonly Random _random = new(); + protected readonly int _freeRoad = 0; + protected readonly int _barrier = 1; + public Bitmap CreateMap(int width, int height, IDrawingObject drawningObject) + { + _width = width; + _height = height; + _drawingObject = drawningObject; + GenerateMap(); + while (!SetObjectOnMap()) + { + GenerateMap(); + } + return DrawMapWithObject(); + } + public Bitmap MoveObject(Direction direction) + { + if (CheckCollision(direction)) + { + _drawingObject.MoveObject(direction); + } + return DrawMapWithObject(); + } + private bool CheckCollision(Direction direction) + { + (float left, float right, float top, float bottom) = _drawingObject.GetCurrentPosition(); + float step = _drawingObject?.Step ?? 0; + int startX = 0, startY = 0, finishX = 0, finishY = 0; + + switch (direction) + { + case Direction.Up: + startX = (int)left; + startY = (int)(top - step); + finishX = (int)right; + finishY = (int)top; + break; + case Direction.Down: + startX = (int)left; + startY = (int)bottom; + finishX = (int)right; + finishY = (int)(bottom + step); + break; + case Direction.Left: + startX = (int)(left - step); + startY = (int)top; + finishX = (int)left; + finishY = (int)bottom; + break; + case Direction.Right: + startX = (int)right; + startY = (int)top; + finishX = (int)(right + step); + finishY = (int)bottom; + break; + } + + if (startX < 0 || finishX > _width || startY < 0 || finishY > _height) return false; + + startX = (int)(startX / _size_x); + startY = (int)(startY / _size_y); + finishX = (int)(finishX / _size_x) + 1; + finishY = (int)(finishY / _size_y) + 1; + + for (int i = startX; i < (finishX > _map.GetLength(0) ? _map.GetLength(0) : finishX); i++) + for (int j = startY; j < (finishY > _map.GetLength(1) ? _map.GetLength(1) : finishY); j++) + if (_map[i, j] == _barrier) return false; + return true; + } + private bool CheckCollisionOnSpawn() + { + (float left, float right, float top, float bottom) = _drawingObject.GetCurrentPosition(); + int spawnX = (int)(left / _size_x) - 1 < 0 ? 0 : (int)(left / _size_x); + int spawnY = (int)(top / _size_y) - 1 < 0 ? 0 : (int)(bottom / _size_y); + + for (int i = spawnX; i <= (int)(right / _size_x) + 1; i++) + for (int j = spawnY; j <= (int)(bottom / _size_y) + 1; j++) + if (_map[i, j] == _barrier) + { + return false; + } + return true; + } + private bool SetObjectOnMap() + { + if (_drawingObject == null || _map == null) + { + return false; + } + int x = _random.Next(0, 10); + int y = _random.Next(0, 10); + _drawingObject.SetObject(x, y, _width, _height); + while (!CheckCollisionOnSpawn()) + { + x += 10; + if (x > _width) + { + if (y < _height) + { + y += 10; + x = 0; + } + else + { + return false; + } + } + _drawingObject.SetObject(x, y, _width, _height); + } + return true; + } + private Bitmap DrawMapWithObject() + { + Bitmap bmp = new(_width, _height); + if (_drawingObject == 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); + } + } + } + _drawingObject.DrawingObjectAntiAircraftGun(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/AntiAircraftGun/AntiAircraftGun/Direction.cs b/AntiAircraftGun/AntiAircraftGun/Direction.cs index c648428..2d7a988 100644 --- a/AntiAircraftGun/AntiAircraftGun/Direction.cs +++ b/AntiAircraftGun/AntiAircraftGun/Direction.cs @@ -11,6 +11,7 @@ namespace AntiAircraftGun /// internal enum Direction { + None = 0, Up = 1, Down = 2, Left = 3, diff --git a/AntiAircraftGun/AntiAircraftGun/DrawingAntiAircraftGun.cs b/AntiAircraftGun/AntiAircraftGun/DrawningAntiAircraftGun.cs similarity index 77% rename from AntiAircraftGun/AntiAircraftGun/DrawingAntiAircraftGun.cs rename to AntiAircraftGun/AntiAircraftGun/DrawningAntiAircraftGun.cs index ebb12f0..022940f 100644 --- a/AntiAircraftGun/AntiAircraftGun/DrawingAntiAircraftGun.cs +++ b/AntiAircraftGun/AntiAircraftGun/DrawningAntiAircraftGun.cs @@ -9,21 +9,21 @@ namespace AntiAircraftGun /// /// Класс, отвечающий за прорисовку и перемещение объекта-сущности /// - internal class DrawingAntiAircraftGun + internal class DrawningAntiAircraftGun { /// /// Класс-сущность /// - public EntityAntiAircraftGun AntiAircraftGun { private set; get; } - public DrawningAntiAircraftGunRollers DrawningRollers { get; private set; } + public EntityAntiAircraftGun AntiAircraftGun { protected set; get; } + public IAntiAircraftGunRollers DrawningRollers { get; private set; } /// /// Левая координата отрисовки зенитного орудия /// - private float _startPosX; + protected float _startPosX; /// /// Верхняя кооридната отрисовки зенитного орудия /// - private float _startPosY; + protected float _startPosY; /// /// Ширина окна отрисовки /// @@ -46,12 +46,24 @@ namespace AntiAircraftGun /// Скорость /// Вес зенитного орудия /// Цвет корпуса - public void Init(int speed, float weight, Color bodyColor) + public DrawningAntiAircraftGun(int speed, float weight, Color bodyColor, IAntiAircraftGunRollers typeAntiAircraftGunRollers) { - AntiAircraftGun = new EntityAntiAircraftGun(); - AntiAircraftGun.Init(speed, weight, bodyColor); - DrawningRollers = new(); - DrawningRollers.CountRollers = 4; + AntiAircraftGun = new EntityAntiAircraftGun(speed, weight, bodyColor); + DrawningRollers = typeAntiAircraftGunRollers; + } + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес зенитного орудия + /// Цвет корпуса + /// Ширина отрисовки зенитного орудия + /// Высота отрисовки зенитного орудия + protected DrawningAntiAircraftGun(int speed, float weight, Color bodyColor, int antiAircrafGunWidth, int antiAircrafGunHeight, IAntiAircraftGunRollers typeAntiAircraftGunRollers): + this(speed, weight, bodyColor, typeAntiAircraftGunRollers) + { + _antiAircrafGunWidth = antiAircrafGunWidth; + _antiAircrafGunHeight = antiAircrafGunHeight; } /// /// Установка позиции зенитного орудия @@ -116,7 +128,7 @@ namespace AntiAircraftGun /// Отрисовка зенитного орудия /// /// - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue) @@ -133,7 +145,7 @@ namespace AntiAircraftGun g.DrawEllipse(pen, _startPosX + 70, _startPosY + 20, 20, 20); //катки в гусеницах Brush brBlack = new SolidBrush(Color.Black); - g.FillEllipse(brBlack, _startPosX +1, _startPosY + 21, 18, 18); + g.FillEllipse(brBlack, _startPosX + 1, _startPosY + 21, 18, 18); g.FillEllipse(brBlack, _startPosX + 71, _startPosY + 21, 18, 18); //корпус Brush br = new SolidBrush(AntiAircraftGun?.BodyColor ?? Color.Black); @@ -166,5 +178,12 @@ namespace AntiAircraftGun _startPosY = _pictureHeight.Value - _antiAircrafGunHeight; } } + /// + /// Получение текущей позиции объекта + /// + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return (_startPosX, _startPosX + _antiAircrafGunWidth, _startPosY, _startPosY + _antiAircrafGunHeight); + } } } diff --git a/AntiAircraftGun/AntiAircraftGun/DrawningAntiAircraftGunRollers.cs b/AntiAircraftGun/AntiAircraftGun/DrawningAntiAircraftGunRollers.cs index 41f623e..cac841b 100644 --- a/AntiAircraftGun/AntiAircraftGun/DrawningAntiAircraftGunRollers.cs +++ b/AntiAircraftGun/AntiAircraftGun/DrawningAntiAircraftGunRollers.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace AntiAircraftGun { - internal class DrawningAntiAircraftGunRollers + internal class DrawningAntiAircraftGunRollers : IAntiAircraftGunRollers { private CountRollers _countRollers; @@ -28,7 +28,7 @@ namespace AntiAircraftGun } } - private void DrawRoller(Graphics g, int _startPosX, int _startPosY) + protected virtual void DrawRoller(Graphics g, int _startPosX, int _startPosY) { Brush brBlack = new SolidBrush(Color.Black); g.FillEllipse(brBlack, _startPosX, _startPosY, 10, 10); diff --git a/AntiAircraftGun/AntiAircraftGun/DrawningFullRollers.cs b/AntiAircraftGun/AntiAircraftGun/DrawningFullRollers.cs new file mode 100644 index 0000000..52930ec --- /dev/null +++ b/AntiAircraftGun/AntiAircraftGun/DrawningFullRollers.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AntiAircraftGun +{ + internal class DrawningFullRollers : DrawningAntiAircraftGunRollers + { + protected override void DrawRoller(Graphics g, int _startPosX, int _startPosY) + { + Brush brBlack = new SolidBrush(Color.Black); + g.FillEllipse(brBlack, _startPosX, _startPosY, 10, 10); + Brush brLight = new SolidBrush(Color.LightGoldenrodYellow); + g.FillEllipse(brLight, _startPosX+2, _startPosY+2, 6, 6); + } + } +} diff --git a/AntiAircraftGun/AntiAircraftGun/DrawningHollowRollers.cs b/AntiAircraftGun/AntiAircraftGun/DrawningHollowRollers.cs new file mode 100644 index 0000000..975e75f --- /dev/null +++ b/AntiAircraftGun/AntiAircraftGun/DrawningHollowRollers.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AntiAircraftGun +{ + internal class DrawningHollowRollers : DrawningAntiAircraftGunRollers + { + protected override void DrawRoller(Graphics g, int _startPosX, int _startPosY) + { + Pen PBlack = new (Color.Black); + g.DrawEllipse(PBlack, _startPosX, _startPosY, 10, 10); + } + } +} diff --git a/AntiAircraftGun/AntiAircraftGun/DrawningObjectAntiAircraftGun.cs b/AntiAircraftGun/AntiAircraftGun/DrawningObjectAntiAircraftGun.cs new file mode 100644 index 0000000..fe71088 --- /dev/null +++ b/AntiAircraftGun/AntiAircraftGun/DrawningObjectAntiAircraftGun.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AntiAircraftGun +{ + internal class DrawningObjectAntiAircraftGun : IDrawingObject + { + private DrawningAntiAircraftGun _antiAircraftGun = null; + public DrawningObjectAntiAircraftGun(DrawningAntiAircraftGun antiAircraftGun) + { + _antiAircraftGun = antiAircraftGun; + } + public float Step => _antiAircraftGun?.AntiAircraftGun?.Step ?? 0; + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return _antiAircraftGun?.GetCurrentPosition() ?? default; + } + public void MoveObject(Direction direction) + { + _antiAircraftGun?.MoveTransport(direction); + } + public void SetObject(int x, int y, int width, int height) + { + _antiAircraftGun.SetPosition(x, y, width, height); + } + + void IDrawingObject.DrawingObjectAntiAircraftGun(Graphics g) + { + _antiAircraftGun?.DrawTransport(g); + } + } +} diff --git a/AntiAircraftGun/AntiAircraftGun/DrawningUpdateAntiAircraftGun.cs b/AntiAircraftGun/AntiAircraftGun/DrawningUpdateAntiAircraftGun.cs new file mode 100644 index 0000000..d3535c1 --- /dev/null +++ b/AntiAircraftGun/AntiAircraftGun/DrawningUpdateAntiAircraftGun.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using static System.Windows.Forms.VisualStyles.VisualStyleElement; + +namespace AntiAircraftGun +{ + internal class DrawningUpdateAntiAircraftGun : DrawningAntiAircraftGun + { + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес зенитного орудия + /// Цвет корпуса + /// Дополнительный цвет + /// Признак наличия башни с орудием + /// Признак наличия радара + public DrawningUpdateAntiAircraftGun(int speed, float weight, Color bodyColor, Color dopColor, bool gun, bool radar, IAntiAircraftGunRollers typeAntiAircraftGunRollers) : + base(speed, weight, bodyColor, 110, 75, typeAntiAircraftGunRollers) + { + AntiAircraftGun = new EntityUpdateAntiAircraftGun(speed, weight, bodyColor, dopColor, gun, radar); + } + public override void DrawTransport(Graphics g) + { + if (AntiAircraftGun is not EntityUpdateAntiAircraftGun updateAntiAircraftGun) + { + return; + } + Pen dopPen = new(updateAntiAircraftGun.DopColor, 4); + Brush dopBrush = new SolidBrush(updateAntiAircraftGun.DopColor); + + if (updateAntiAircraftGun.Gun) + { + g.FillRectangle(dopBrush, _startPosX + 35, _startPosY + 30, 25, 15); + g.FillRectangle(dopBrush, _startPosX + 60, _startPosY + 38, 50, 3); + } + if (updateAntiAircraftGun.Radar) + { + g.DrawLine(dopPen, _startPosX + 27, _startPosY + 37, _startPosX + 27, _startPosY + 20); + g.FillPie(dopBrush, _startPosX + 3, _startPosY, 30, 30, -45, 180); + } + _startPosY += 35; + base.DrawTransport(g); + _startPosY -= 35; + } + } +} diff --git a/AntiAircraftGun/AntiAircraftGun/EntityAntiAircraftGun.cs b/AntiAircraftGun/AntiAircraftGun/EntityAntiAircraftGun.cs index f81d3d8..a9705c9 100644 --- a/AntiAircraftGun/AntiAircraftGun/EntityAntiAircraftGun.cs +++ b/AntiAircraftGun/AntiAircraftGun/EntityAntiAircraftGun.cs @@ -31,7 +31,7 @@ namespace AntiAircraftGun /// /// /// - public void Init(int speed, float weight, Color bodyColor) + public EntityAntiAircraftGun(int speed, float weight, Color bodyColor) { Random rnd = new(); Speed = speed <= 0 ? rnd.Next(50, 150) : speed; diff --git a/AntiAircraftGun/AntiAircraftGun/EntityUpdateAntiAircraftGun.cs b/AntiAircraftGun/AntiAircraftGun/EntityUpdateAntiAircraftGun.cs new file mode 100644 index 0000000..ff00aa8 --- /dev/null +++ b/AntiAircraftGun/AntiAircraftGun/EntityUpdateAntiAircraftGun.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AntiAircraftGun +{ + internal class EntityUpdateAntiAircraftGun : EntityAntiAircraftGun + { + /// + /// Дополнительный цвет + /// + public Color DopColor { get; private set; } + /// + /// Признак наличия башни с орудием + /// + public bool Gun { get; private set; } + /// + /// Признак наличия радара + /// + public bool Radar { get; private set; } + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес зенитного орудия + /// Цвет корпуса + /// Дополнительный цвет + /// Признак наличия башни с орудием + /// Признак наличия радара + public EntityUpdateAntiAircraftGun(int speed, float weight, Color bodyColor, Color dopColor, bool gun, bool radar) : + base(speed, weight, bodyColor) + { + DopColor = dopColor; + Gun = gun; + Radar = radar; + } + } +} diff --git a/AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGun.Designer.cs b/AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGun.Designer.cs index 5362f59..326f84b 100644 --- a/AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGun.Designer.cs +++ b/AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGun.Designer.cs @@ -38,8 +38,10 @@ this.buttonLeft = new System.Windows.Forms.Button(); this.buttonRight = new System.Windows.Forms.Button(); this.buttonDown = new System.Windows.Forms.Button(); - this.labelPortholes = new System.Windows.Forms.Label(); + this.buttonCreareModif = new System.Windows.Forms.Button(); + this.comboBoxTypeRollers = new System.Windows.Forms.ComboBox(); this.comboBoxRollers = new System.Windows.Forms.ComboBox(); + this.labelPortholes = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAntiAircraftGun)).BeginInit(); this.statusStrip.SuspendLayout(); this.SuspendLayout(); @@ -107,7 +109,7 @@ this.buttonUp.Location = new System.Drawing.Point(634, 256); this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonUp.Name = "buttonUp"; - this.buttonUp.Size = new System.Drawing.Size(26, 26); + this.buttonUp.Size = new System.Drawing.Size(26, 22); this.buttonUp.TabIndex = 3; this.buttonUp.UseVisualStyleBackColor = true; this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); @@ -120,7 +122,7 @@ this.buttonLeft.Location = new System.Drawing.Point(602, 284); this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonLeft.Name = "buttonLeft"; - this.buttonLeft.Size = new System.Drawing.Size(26, 26); + this.buttonLeft.Size = new System.Drawing.Size(26, 22); this.buttonLeft.TabIndex = 4; this.buttonLeft.UseVisualStyleBackColor = true; this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); @@ -133,7 +135,7 @@ this.buttonRight.Location = new System.Drawing.Point(665, 284); this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonRight.Name = "buttonRight"; - this.buttonRight.Size = new System.Drawing.Size(26, 26); + this.buttonRight.Size = new System.Drawing.Size(26, 22); this.buttonRight.TabIndex = 5; this.buttonRight.UseVisualStyleBackColor = true; this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); @@ -146,19 +148,35 @@ this.buttonDown.Location = new System.Drawing.Point(634, 284); this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonDown.Name = "buttonDown"; - this.buttonDown.Size = new System.Drawing.Size(26, 26); + this.buttonDown.Size = new System.Drawing.Size(26, 22); this.buttonDown.TabIndex = 6; this.buttonDown.UseVisualStyleBackColor = true; this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); // - // labelPortholes + // buttonCreareModif // - this.labelPortholes.AutoSize = true; - this.labelPortholes.Location = new System.Drawing.Point(98, 290); - this.labelPortholes.Name = "labelPortholes"; - this.labelPortholes.Size = new System.Drawing.Size(121, 15); - this.labelPortholes.TabIndex = 8; - this.labelPortholes.Text = "Колличество катков:"; + this.buttonCreareModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreareModif.Location = new System.Drawing.Point(97, 286); + this.buttonCreareModif.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonCreareModif.Name = "buttonCreareModif"; + this.buttonCreareModif.Size = new System.Drawing.Size(109, 22); + this.buttonCreareModif.TabIndex = 7; + this.buttonCreareModif.Text = "Модификация"; + this.buttonCreareModif.UseVisualStyleBackColor = true; + this.buttonCreareModif.Click += new System.EventHandler(this.ButtonCreareModif_Click); + // + // comboBoxTypeRollers + // + this.comboBoxTypeRollers.FormattingEnabled = true; + this.comboBoxTypeRollers.Items.AddRange(new object[] { + "Дополнительные", + "Полые", + "Стандартные"}); + this.comboBoxTypeRollers.Location = new System.Drawing.Point(10, 257); + this.comboBoxTypeRollers.Name = "comboBoxTypeRollers"; + this.comboBoxTypeRollers.Size = new System.Drawing.Size(121, 23); + this.comboBoxTypeRollers.TabIndex = 10; + this.comboBoxTypeRollers.Text = "Стандартные"; // // comboBoxRollers // @@ -167,19 +185,31 @@ "4", "5", "6"}); - this.comboBoxRollers.Location = new System.Drawing.Point(225, 285); + this.comboBoxRollers.Location = new System.Drawing.Point(275, 257); this.comboBoxRollers.Name = "comboBoxRollers"; this.comboBoxRollers.Size = new System.Drawing.Size(44, 23); - this.comboBoxRollers.TabIndex = 9; + this.comboBoxRollers.TabIndex = 11; this.comboBoxRollers.Text = "4"; + this.comboBoxRollers.SelectedIndexChanged += new System.EventHandler(this.comboBoxRollers_SelectedIndexChanged); + // + // labelPortholes + // + this.labelPortholes.AutoSize = true; + this.labelPortholes.Location = new System.Drawing.Point(137, 263); + this.labelPortholes.Name = "labelPortholes"; + this.labelPortholes.Size = new System.Drawing.Size(132, 15); + this.labelPortholes.TabIndex = 12; + this.labelPortholes.Text = "Колличество роликов:"; // // FormAntiAircraftGun // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(700, 338); - this.Controls.Add(this.comboBoxRollers); this.Controls.Add(this.labelPortholes); + this.Controls.Add(this.comboBoxRollers); + this.Controls.Add(this.comboBoxTypeRollers); + this.Controls.Add(this.buttonCreareModif); this.Controls.Add(this.buttonDown); this.Controls.Add(this.buttonRight); this.Controls.Add(this.buttonLeft); @@ -212,7 +242,9 @@ private Button buttonLeft; private Button buttonRight; private Button buttonDown; - private Label labelPortholes; + private Button buttonCreareModif; + private ComboBox comboBoxTypeRollers; private ComboBox comboBoxRollers; + private Label labelPortholes; } } \ No newline at end of file diff --git a/AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGun.cs b/AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGun.cs index a193087..f752971 100644 --- a/AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGun.cs +++ b/AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGun.cs @@ -4,7 +4,7 @@ namespace AntiAircraftGun { public partial class FormAntiAircraftGun : Form { - private DrawingAntiAircraftGun _antiAircrafGun; + private DrawningAntiAircraftGun _antiAircrafGun; public FormAntiAircraftGun() { @@ -23,6 +23,17 @@ namespace AntiAircraftGun pictureBoxAntiAircraftGun.Image = bmp; } } + /// + /// + /// + private void SetData() + { + Random rnd = new(); + _antiAircrafGun.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxAntiAircraftGun.Width, pictureBoxAntiAircraftGun.Height); + toolStripStatusLabelSpeed.Text = $": {_antiAircrafGun.AntiAircraftGun.Speed}"; + toolStripStatusLabelWeight.Text = $": {_antiAircrafGun.AntiAircraftGun.Weight}"; + toolStripStatusLabelBodyColor.Text = $": {_antiAircrafGun.AntiAircraftGun.BodyColor.Name}"; + } /// /// "" @@ -31,20 +42,27 @@ namespace AntiAircraftGun /// private void ButtonCreate_Click(object sender, EventArgs e) { - Random rnd = new(); - _antiAircrafGun = new DrawingAntiAircraftGun(); - _antiAircrafGun.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), - Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); - _antiAircrafGun.DrawningRollers.CountRollers = Convert.ToInt32(comboBoxRollers.Text); - _antiAircrafGun.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), - pictureBoxAntiAircraftGun.Width, pictureBoxAntiAircraftGun.Height); - toolStripStatusLabelSpeed.Text = $": {_antiAircrafGun.AntiAircraftGun.Speed}"; - toolStripStatusLabelWeight.Text = $": {_antiAircrafGun.AntiAircraftGun.Weight}"; - toolStripStatusLabelBodyColor.Text = $": {_antiAircrafGun.AntiAircraftGun.BodyColor.Name}"; - Draw(); + IAntiAircraftGunRollers typeAntiAircraftGunRollers = new DrawningAntiAircraftGunRollers(); + switch (comboBoxTypeRollers.Text) + { + case "": + typeAntiAircraftGunRollers = new DrawningHollowRollers(); + break; + case "": + typeAntiAircraftGunRollers = new DrawningFullRollers(); + break; + } + Random rnd = new(); + _antiAircrafGun = new DrawningAntiAircraftGun(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), typeAntiAircraftGunRollers); + _antiAircrafGun.DrawningRollers.CountRollers = Convert.ToInt32(comboBoxRollers.Text); + _antiAircrafGun.SetPosition(rnd.Next(20, 100), rnd.Next(20, 100), pictureBoxAntiAircraftGun.Width, pictureBoxAntiAircraftGun.Height); + toolStripStatusLabelSpeed.Text = $": {_antiAircrafGun.AntiAircraftGun.Speed}"; + toolStripStatusLabelWeight.Text = $": {_antiAircrafGun.AntiAircraftGun.Weight}"; + toolStripStatusLabelBodyColor.Text = $": {_antiAircrafGun.AntiAircraftGun.BodyColor.Name}"; + Draw(); } /// - /// + /// /// /// /// @@ -79,5 +97,38 @@ namespace AntiAircraftGun _antiAircrafGun?.ChangeBorders(pictureBoxAntiAircraftGun.Width, pictureBoxAntiAircraftGun.Height); Draw(); } + /// + /// "" + /// + /// + /// + private void ButtonCreareModif_Click(object sender, EventArgs e) + { + IAntiAircraftGunRollers typeAntiAircraftGunRollers = new DrawningAntiAircraftGunRollers(); + switch (comboBoxTypeRollers.Text) + { + case "": + typeAntiAircraftGunRollers = new DrawningHollowRollers(); + break; + case "": + typeAntiAircraftGunRollers = new DrawningFullRollers(); + break; + } + Random rnd = new(); + _antiAircrafGun = new DrawningUpdateAntiAircraftGun(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)), + typeAntiAircraftGunRollers); + _antiAircrafGun.DrawningRollers.CountRollers = Convert.ToInt32(comboBoxRollers.Text); + SetData(); + Draw(); + } + + private void comboBoxRollers_SelectedIndexChanged(object sender, EventArgs e) + { + + } } } \ No newline at end of file diff --git a/AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGun.resx b/AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGun.resx index 2c0949d..bbf576a 100644 --- a/AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGun.resx +++ b/AntiAircraftGun/AntiAircraftGun/FormAntiAircraftGun.resx @@ -60,4 +60,7 @@ 17, 17 + + 79 + \ No newline at end of file diff --git a/AntiAircraftGun/AntiAircraftGun/FormMap.Designer.cs b/AntiAircraftGun/AntiAircraftGun/FormMap.Designer.cs new file mode 100644 index 0000000..a20361f --- /dev/null +++ b/AntiAircraftGun/AntiAircraftGun/FormMap.Designer.cs @@ -0,0 +1,264 @@ +namespace AntiAircraftGun +{ + 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.pictureBoxAntiAircraftGun = 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.buttonRight = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonCreareModif = new System.Windows.Forms.Button(); + this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + this.comboBoxRollers = new System.Windows.Forms.ComboBox(); + this.comboBoxTypeRollers = new System.Windows.Forms.ComboBox(); + this.labelPortholes = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAntiAircraftGun)).BeginInit(); + this.statusStrip.SuspendLayout(); + this.SuspendLayout(); + // + // pictureBoxAntiAircraftGun + // + this.pictureBoxAntiAircraftGun.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBoxAntiAircraftGun.Location = new System.Drawing.Point(0, 0); + this.pictureBoxAntiAircraftGun.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.pictureBoxAntiAircraftGun.Name = "pictureBoxAntiAircraftGun"; + this.pictureBoxAntiAircraftGun.Size = new System.Drawing.Size(700, 316); + this.pictureBoxAntiAircraftGun.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBoxAntiAircraftGun.TabIndex = 0; + this.pictureBoxAntiAircraftGun.TabStop = false; + // + // statusStrip + // + this.statusStrip.ImageScalingSize = new System.Drawing.Size(20, 20); + this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabelBodyColor}); + this.statusStrip.Location = new System.Drawing.Point(0, 316); + this.statusStrip.Name = "statusStrip"; + this.statusStrip.Padding = new System.Windows.Forms.Padding(1, 0, 12, 0); + this.statusStrip.Size = new System.Drawing.Size(700, 22); + this.statusStrip.TabIndex = 1; + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(59, 17); + this.toolStripStatusLabelSpeed.Text = "Скорость"; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(26, 17); + this.toolStripStatusLabelWeight.Text = "Вес"; + // + // toolStripStatusLabelBodyColor + // + this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(33, 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(10, 286); + this.buttonCreate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonCreate.Name = "buttonCreate"; + this.buttonCreate.Size = new System.Drawing.Size(82, 22); + 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::AntiAircraftGun.Properties.Resources.arrowUp; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(634, 256); + this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(26, 22); + this.buttonUp.TabIndex = 3; + this.buttonUp.UseVisualStyleBackColor = true; + this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonLeft + // + this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonLeft.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowLeft; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(602, 284); + this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(26, 22); + this.buttonLeft.TabIndex = 4; + this.buttonLeft.UseVisualStyleBackColor = true; + this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonRight + // + this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRight.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowRight; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(665, 284); + this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(26, 22); + this.buttonRight.TabIndex = 5; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonDown + // + this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonDown.BackgroundImage = global::AntiAircraftGun.Properties.Resources.arrowDown; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(634, 284); + this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(26, 22); + this.buttonDown.TabIndex = 6; + this.buttonDown.UseVisualStyleBackColor = true; + this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonCreareModif + // + this.buttonCreareModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreareModif.Location = new System.Drawing.Point(97, 286); + this.buttonCreareModif.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonCreareModif.Name = "buttonCreareModif"; + this.buttonCreareModif.Size = new System.Drawing.Size(109, 22); + this.buttonCreareModif.TabIndex = 7; + this.buttonCreareModif.Text = "Модификация"; + this.buttonCreareModif.UseVisualStyleBackColor = true; + this.buttonCreareModif.Click += new System.EventHandler(this.ButtonCreareModif_Click); + // + // comboBoxSelectorMap + // + this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxSelectorMap.FormattingEnabled = true; + this.comboBoxSelectorMap.Items.AddRange(new object[] { + "Простая карта", + "Простая карта 2"}); + this.comboBoxSelectorMap.Location = new System.Drawing.Point(10, 9); + this.comboBoxSelectorMap.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; + this.comboBoxSelectorMap.Size = new System.Drawing.Size(133, 23); + this.comboBoxSelectorMap.TabIndex = 8; + this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); + // + // comboBoxRollers + // + this.comboBoxRollers.FormattingEnabled = true; + this.comboBoxRollers.Items.AddRange(new object[] { + "4", + "5", + "6"}); + this.comboBoxRollers.Location = new System.Drawing.Point(277, 255); + this.comboBoxRollers.Name = "comboBoxRollers"; + this.comboBoxRollers.Size = new System.Drawing.Size(44, 23); + this.comboBoxRollers.TabIndex = 13; + this.comboBoxRollers.Text = "4"; + // + // comboBoxTypeRollers + // + this.comboBoxTypeRollers.FormattingEnabled = true; + this.comboBoxTypeRollers.Items.AddRange(new object[] { + "Дополнительные", + "Полые", + "Стандартные"}); + this.comboBoxTypeRollers.Location = new System.Drawing.Point(12, 255); + this.comboBoxTypeRollers.Name = "comboBoxTypeRollers"; + this.comboBoxTypeRollers.Size = new System.Drawing.Size(121, 23); + this.comboBoxTypeRollers.TabIndex = 12; + this.comboBoxTypeRollers.Text = "Стандартные"; + // + // labelPortholes + // + this.labelPortholes.AutoSize = true; + this.labelPortholes.Location = new System.Drawing.Point(139, 260); + this.labelPortholes.Name = "labelPortholes"; + this.labelPortholes.Size = new System.Drawing.Size(132, 15); + this.labelPortholes.TabIndex = 14; + this.labelPortholes.Text = "Колличество роликов:"; + // + // FormMap + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(700, 338); + this.Controls.Add(this.labelPortholes); + this.Controls.Add(this.comboBoxRollers); + this.Controls.Add(this.comboBoxTypeRollers); + this.Controls.Add(this.comboBoxSelectorMap); + this.Controls.Add(this.buttonCreareModif); + this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonRight); + this.Controls.Add(this.buttonLeft); + this.Controls.Add(this.buttonUp); + this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.pictureBoxAntiAircraftGun); + this.Controls.Add(this.statusStrip); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.MinimumSize = new System.Drawing.Size(46, 70); + this.Name = "FormMap"; + this.Text = "Карта"; + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAntiAircraftGun)).EndInit(); + this.statusStrip.ResumeLayout(false); + this.statusStrip.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private PictureBox pictureBoxAntiAircraftGun; + private StatusStrip statusStrip; + private ToolStripStatusLabel toolStripStatusLabelSpeed; + private ToolStripStatusLabel toolStripStatusLabelWeight; + private ToolStripStatusLabel toolStripStatusLabelBodyColor; + private Button buttonCreate; + private Button buttonUp; + private Button buttonLeft; + private Button buttonRight; + private Button buttonDown; + private Button buttonCreareModif; + private ComboBox comboBoxSelectorMap; + private ComboBox comboBoxRollers; + private ComboBox comboBoxTypeRollers; + private Label labelPortholes; + } +} \ No newline at end of file diff --git a/AntiAircraftGun/AntiAircraftGun/FormMap.cs b/AntiAircraftGun/AntiAircraftGun/FormMap.cs new file mode 100644 index 0000000..d9fbd5c --- /dev/null +++ b/AntiAircraftGun/AntiAircraftGun/FormMap.cs @@ -0,0 +1,128 @@ +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; +using System.Xml.Serialization; + +namespace AntiAircraftGun +{ + public partial class FormMap : Form + { + private AbstractMap _abstractMap; + public FormMap() + { + InitializeComponent(); + _abstractMap = new SimpleMap(); + } + /// + /// Заполнение информации по объекту + /// + /// + private void SetData(DrawningAntiAircraftGun antiAircraftGun) + { + toolStripStatusLabelSpeed.Text = $"Скорость: {antiAircraftGun.AntiAircraftGun.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {antiAircraftGun.AntiAircraftGun.Weight}"; + toolStripStatusLabelBodyColor.Text = $"Цвет: {antiAircraftGun.AntiAircraftGun.BodyColor.Name}"; + pictureBoxAntiAircraftGun.Image = _abstractMap.CreateMap(pictureBoxAntiAircraftGun.Width, pictureBoxAntiAircraftGun.Height, + new DrawningObjectAntiAircraftGun(antiAircraftGun)); + } + /// + /// Обработка нажатия кнопки "Создать" + /// + /// + /// + private void ButtonCreate_Click(object sender, EventArgs e) + { + IAntiAircraftGunRollers typeAntiAircraftGunRollers = new DrawningAntiAircraftGunRollers(); + switch (comboBoxTypeRollers.Text) + { + case "Полые": + typeAntiAircraftGunRollers = new DrawningHollowRollers(); + break; + case "Дополнительные": + typeAntiAircraftGunRollers = new DrawningFullRollers(); + break; + } + Random rnd = new(); + var antiAircraftGun = new DrawningAntiAircraftGun(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), typeAntiAircraftGunRollers); + antiAircraftGun.DrawningRollers.CountRollers = Convert.ToInt32(comboBoxRollers.Text); + SetData(antiAircraftGun); + } + /// + /// Определение направления + /// + /// + /// + 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; + } + pictureBoxAntiAircraftGun.Image = _abstractMap?.MoveObject(dir); + } + /// + /// Обработка нажатия кнопки "Модификация" + /// + /// + /// + private void ButtonCreareModif_Click(object sender, EventArgs e) + { + + IAntiAircraftGunRollers typeAntiAircraftGunRollers = new DrawningAntiAircraftGunRollers(); + switch (comboBoxTypeRollers.Text) + { + case "Полые": + typeAntiAircraftGunRollers = new DrawningHollowRollers(); + break; + case "Дополнительные": + typeAntiAircraftGunRollers = new DrawningFullRollers(); + break; + } + Random rnd = new(); + var antiAircraftGun = new DrawningUpdateAntiAircraftGun(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)), + typeAntiAircraftGunRollers); + antiAircraftGun.DrawningRollers.CountRollers = Convert.ToInt32(comboBoxRollers.Text); + SetData(antiAircraftGun); + } + /// + /// Смена карты + /// + /// + /// + private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxSelectorMap.Text) + { + case "Простая карта": + _abstractMap = new SimpleMap(); + break; + case "Простая карта 2": + _abstractMap = new SimpleMap2(); + break; + } + } + } +} diff --git a/AntiAircraftGun/AntiAircraftGun/FormMap.resx b/AntiAircraftGun/AntiAircraftGun/FormMap.resx new file mode 100644 index 0000000..2c0949d --- /dev/null +++ b/AntiAircraftGun/AntiAircraftGun/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/AntiAircraftGun/AntiAircraftGun/IAntiAircraftGunRollers.cs b/AntiAircraftGun/AntiAircraftGun/IAntiAircraftGunRollers.cs new file mode 100644 index 0000000..bb6f05e --- /dev/null +++ b/AntiAircraftGun/AntiAircraftGun/IAntiAircraftGunRollers.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AntiAircraftGun +{ + internal interface IAntiAircraftGunRollers + { + int CountRollers { set; } + public void DrawRollers(Graphics g, int _startPosX, int _startPosY, int _antiAircraftGunWidth); + } +} diff --git a/AntiAircraftGun/AntiAircraftGun/IDrawingObject.cs b/AntiAircraftGun/AntiAircraftGun/IDrawingObject.cs new file mode 100644 index 0000000..ee0ad14 --- /dev/null +++ b/AntiAircraftGun/AntiAircraftGun/IDrawingObject.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AntiAircraftGun +{ + /// + /// Интерфейс для работы с объектом, прорисовываемом на форме + /// + internal interface IDrawingObject + { + /// + /// Шаг перемещения объекта + /// + public float Step { get; } + /// + /// Установка позиции объекта + /// + /// Координата X + /// Координата Y + /// Ширина полотна + /// Высота полотна + void SetObject(int x, int y, int width, int height); + /// + /// Изменение направления пермещения объекта + /// + /// Направление + void MoveObject(Direction direction); + /// + /// Отрисовка объекта + /// + /// + void DrawingObjectAntiAircraftGun(Graphics g); + /// + /// Получение текущей позиции объекта + /// + /// + (float Left, float Right, float Top, float Bottom) GetCurrentPosition(); + } +} diff --git a/AntiAircraftGun/AntiAircraftGun/Program.cs b/AntiAircraftGun/AntiAircraftGun/Program.cs index 5abc523..a824863 100644 --- a/AntiAircraftGun/AntiAircraftGun/Program.cs +++ b/AntiAircraftGun/AntiAircraftGun/Program.cs @@ -11,7 +11,7 @@ namespace AntiAircraftGun // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormAntiAircraftGun()); + Application.Run(new FormMap()); } } } \ No newline at end of file diff --git a/AntiAircraftGun/AntiAircraftGun/Resources/arrowDown1.jpg b/AntiAircraftGun/AntiAircraftGun/Resources/arrowDown1.jpg index 5c043ad..240474e 100644 Binary files a/AntiAircraftGun/AntiAircraftGun/Resources/arrowDown1.jpg and b/AntiAircraftGun/AntiAircraftGun/Resources/arrowDown1.jpg differ diff --git a/AntiAircraftGun/AntiAircraftGun/Resources/arrowLeft1.jpg b/AntiAircraftGun/AntiAircraftGun/Resources/arrowLeft1.jpg index d4776f2..5a0dd24 100644 Binary files a/AntiAircraftGun/AntiAircraftGun/Resources/arrowLeft1.jpg and b/AntiAircraftGun/AntiAircraftGun/Resources/arrowLeft1.jpg differ diff --git a/AntiAircraftGun/AntiAircraftGun/Resources/arrowRight1.jpg b/AntiAircraftGun/AntiAircraftGun/Resources/arrowRight1.jpg index 5a32f5a..0b7f14a 100644 Binary files a/AntiAircraftGun/AntiAircraftGun/Resources/arrowRight1.jpg and b/AntiAircraftGun/AntiAircraftGun/Resources/arrowRight1.jpg differ diff --git a/AntiAircraftGun/AntiAircraftGun/Resources/arrowUp1.jpg b/AntiAircraftGun/AntiAircraftGun/Resources/arrowUp1.jpg index 80f69dc..a8c02ef 100644 Binary files a/AntiAircraftGun/AntiAircraftGun/Resources/arrowUp1.jpg and b/AntiAircraftGun/AntiAircraftGun/Resources/arrowUp1.jpg differ diff --git a/AntiAircraftGun/AntiAircraftGun/SimpleMap.cs b/AntiAircraftGun/AntiAircraftGun/SimpleMap.cs new file mode 100644 index 0000000..4c0b89c --- /dev/null +++ b/AntiAircraftGun/AntiAircraftGun/SimpleMap.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AntiAircraftGun +{ + /// + /// Простая реализация абсрактного класса AbstractMap + /// + internal class SimpleMap : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Brush barrierColor = new SolidBrush(Color.Black); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.LightGray); + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y); + } + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y); + } + protected override void GenerateMap() + { + _map = new int[100, 100]; + _size_x = (float)_width / _map.GetLength(0); + _size_y = (float)_height / _map.GetLength(1); + int counter = 0; + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + _map[i, j] = _freeRoad; + } + } + while (counter < 25) + { + 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/AntiAircraftGun/AntiAircraftGun/SimpleMap2.cs b/AntiAircraftGun/AntiAircraftGun/SimpleMap2.cs new file mode 100644 index 0000000..e9f8043 --- /dev/null +++ b/AntiAircraftGun/AntiAircraftGun/SimpleMap2.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AntiAircraftGun +{ + internal class SimpleMap2 : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Brush barrierColor = new SolidBrush(Color.Black); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.LightGreen); + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y); + } + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y); + } + protected override void GenerateMap() + { + _map = new int[100, 100]; + _size_x = (float)_width / _map.GetLength(0); + _size_y = (float)_height / _map.GetLength(1); + int counter = 0; + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + _map[i, j] = _freeRoad; + } + } + while (counter < 15) + { + int x = _random.Next(0, 99); + int y = _random.Next(0, 100); + if (_map[x, y] == _freeRoad) + { + _map[x, y] = _barrier; + _map[x + 1, y] = _barrier; + counter++; + } + } + } + } +}