diff --git a/Battleship/Battleship/AbstractMap.cs b/Battleship/Battleship/AbstractMap.cs new file mode 100644 index 0000000..605c54c --- /dev/null +++ b/Battleship/Battleship/AbstractMap.cs @@ -0,0 +1,131 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Battleship +{ + internal abstract class AbstractMap + { + private IDrawningObject _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 Random(); + protected readonly int _freeRoad = 0; + protected readonly int _barrier = 1; + + + public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject) + { + _width = width; + _height = height; + _drawingObject = drawningObject; + GenerateMap(); + while (!SetObjectOnMap()) + { + GenerateMap(); + } + return DrawMapWithObject(); + } + public Bitmap MoveObject(Direction direction) + { + + _drawingObject.MoveObject(direction); + + bool collision = CheckCollision(); + + if (collision) + { + switch (direction) + { + case Direction.Left: + _drawingObject.MoveObject(Direction.Right); + break; + case Direction.Right: + _drawingObject.MoveObject(Direction.Left); + break; + case Direction.Up: + _drawingObject.MoveObject(Direction.Down); + break; + case Direction.Down: + _drawingObject.MoveObject(Direction.Up); + break; + } + } + + return DrawMapWithObject(); + } + 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); + + return !CheckCollision(); + } + 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.DrawningObject(gr); + return bmp; + + } + + private bool CheckCollision() + { + var pos = _drawingObject.GetCurrentPosition(); + int startX = (int)((pos.Left) / _size_x); + int endX = (int)((pos.Right) / _size_x); + int startY = (int)((pos.Top) / _size_y); + int endY = (int)((pos.Bottom) / _size_y); + + if (startX < 0 || startY < 0 || endX > _map.GetLength(1) || endY > _map.GetLength(0)) { return false; } + + + + for (int y = startY; y < endY; y++) + { + for (int x = startX; x < endX; x++) + { + if (_map[x, y] == _barrier) + { + return true; + } + } + } + + return false; + } + + 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/Battleship/Battleship/Direction.cs b/Battleship/Battleship/Direction.cs index ddbac72..048f8e8 100644 --- a/Battleship/Battleship/Direction.cs +++ b/Battleship/Battleship/Direction.cs @@ -11,6 +11,7 @@ namespace Battleship /// internal enum Direction { + None = 0, Up = 1, Down = 2, Left = 3, diff --git a/Battleship/Battleship/DrawningBattleship.cs b/Battleship/Battleship/DrawningBattleship.cs index 2217080..6341f46 100644 --- a/Battleship/Battleship/DrawningBattleship.cs +++ b/Battleship/Battleship/DrawningBattleship.cs @@ -14,15 +14,15 @@ namespace Battleship /// /// Класс-сущность /// - public EntityBattleship Battleship { get; private set; } + public EntityBattleship Battleship { get; protected set; } /// /// Левая координата отрисовки боевого корабля /// - private float _startPosX; + protected float _startPosX; /// /// Верхняя кооридната отрисовки боевого корабля /// - private float _startPosY; + protected float _startPosY; /// /// Ширина окна отрисовки /// @@ -34,21 +34,34 @@ namespace Battleship /// /// Ширина отрисовки боевого корабля /// - private readonly int _battleshipWidth = 80; + private readonly int _battleshipWidth = 130; /// /// Высота отрисовки боевого корабля /// - private readonly int _battleshipHeight = 50; + private readonly int _battleshipHeight = 40; /// /// Инициализация свойств /// /// Скорость /// Вес боевого корабля /// Цвет корпуса - public void Init(int speed, float weight, Color bodyColor) + public DrawningBattleship(int speed, float weight, Color bodyColor) { - Battleship = new EntityBattleship(); - Battleship.Init(speed, weight, bodyColor); + Battleship = new EntityBattleship(speed, weight, bodyColor); + } + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес военного корабля + /// Цвет корпуса корабля + /// Ширина отрисовки военного корабля + /// Высота отрисовки военного корабля + protected DrawningBattleship(int speed, float weight, Color bodyColor, int battleshipWidth, int battleshipHeight) : + this(speed, weight, bodyColor) + { + _battleshipWidth = battleshipWidth; + _battleshipHeight = battleshipHeight; } /// /// Установка позиции боевого корабля @@ -117,7 +130,7 @@ namespace Battleship /// Отрисовка боевого корабля /// /// - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue) @@ -131,10 +144,10 @@ namespace Battleship g.DrawRectangle(pen, _startPosX - 4, _startPosY + 4, 4, 10); g.DrawRectangle(pen, _startPosX - 4, _startPosY + 16 , 4, 10); g.DrawRectangle(pen, _startPosX + 40, _startPosY + 4, 10, 20); - g.DrawRectangle(pen, _startPosX , _startPosY, 70, 30); - PointF point_triangle_1 = new PointF(_startPosX + 70, _startPosY); - PointF point_triangle_2 = new PointF(_startPosX + 90, _startPosY + 15); - PointF point_triangle_3 = new PointF(_startPosX + 70, _startPosY + 30); + g.DrawRectangle(pen, _startPosX , _startPosY, 110, 30); + PointF point_triangle_1 = new PointF(_startPosX + 110, _startPosY); + PointF point_triangle_2 = new PointF(_startPosX + 130, _startPosY + 15); + PointF point_triangle_3 = new PointF(_startPosX + 110, _startPosY + 30); PointF[] assembled_triangle = { point_triangle_1, @@ -151,7 +164,7 @@ namespace Battleship //палуба корабля Brush br = new SolidBrush(Battleship?.BodyColor ?? Color.Black); - g.FillRectangle(br, _startPosX, _startPosY, 70, 30); + g.FillRectangle(br, _startPosX, _startPosY, 110, 30); g.FillPolygon(br, assembled_triangle); //отсек корабля @@ -190,5 +203,13 @@ namespace Battleship _startPosY = _pictureHeight.Value - _battleshipHeight; } } + /// + /// Получение текущей позиции объекта + /// + /// + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return (_startPosX, _startPosX + _battleshipWidth, _startPosY, _startPosY + _battleshipHeight); + } } } diff --git a/Battleship/Battleship/DrawningGunBattleship.cs b/Battleship/Battleship/DrawningGunBattleship.cs new file mode 100644 index 0000000..b1a4a02 --- /dev/null +++ b/Battleship/Battleship/DrawningGunBattleship.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Battleship +{ + internal class DrawningGunBattleship : DrawningBattleship + { + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес военного корабля + /// Цвет корпуса корабля + /// Дополнительный цвет + /// Признак наличия отсека для ракет + /// Признак наличия орудийной башни + /// Признак наличия забора на корме + public DrawningGunBattleship(int speed, float weight, Color bodyColor, Color dopColor, bool compartmentRocket, bool gunTower, bool sternFence) : + base(speed, weight, bodyColor, 140, 40) + { + Battleship = new EntityGunBattleship(speed, weight, bodyColor, dopColor, compartmentRocket, gunTower, sternFence); + } + public override void DrawTransport(Graphics g) + { + if (Battleship is not EntityGunBattleship gunBattleship) + { + return; + } + + Pen pen = new(Color.Black); + Brush dopBrush = new SolidBrush(gunBattleship.DopColor); + + if (gunBattleship.CompartmentRocket) + { + g.FillRectangle(dopBrush, _startPosX + 85, _startPosY + 10, 15, 20); + + g.DrawRectangle(pen, _startPosX + 85, _startPosY + 10, 15, 20); + } + + _startPosX += 10; + _startPosY += 5; + base.DrawTransport(g); + _startPosX -= 10; + _startPosY -= 5; + + if (gunBattleship.GunTower) + { + g.FillEllipse(dopBrush, _startPosX + 105, _startPosY + 12, 17, 17); + g.FillRectangle(dopBrush, _startPosX + 121, _startPosY + 17, 11, 7); + + g.DrawEllipse(pen, _startPosX + 105, _startPosY + 12, 17, 17); + g.DrawRectangle(pen, _startPosX + 121, _startPosY + 17, 11, 7); + } + + if (gunBattleship.SternFence) + { + g.FillRectangle(dopBrush, _startPosX + 13, _startPosY + 8, 5, 25); + g.DrawRectangle(pen, _startPosX + 13, _startPosY + 8, 5, 25); + } + } + } +} diff --git a/Battleship/Battleship/DrawningObjectBattleship.cs b/Battleship/Battleship/DrawningObjectBattleship.cs new file mode 100644 index 0000000..d934dcb --- /dev/null +++ b/Battleship/Battleship/DrawningObjectBattleship.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Battleship +{ + internal class DrawningObjectBattleship : IDrawningObject + { + private DrawningBattleship _battleship = null; + + public DrawningObjectBattleship(DrawningBattleship battleship) + { + _battleship = battleship; + } + + public float Step => _battleship?.Battleship?.Step ?? 0; + + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return _battleship?.GetCurrentPosition() ?? default; + } + + public void MoveObject(Direction direction) + { + _battleship?.MoveTransport(direction); + } + + public void SetObject(int x, int y, int width, int height) + { + _battleship.SetPosition(x, y, width, height); + } + + void IDrawningObject.DrawningObject(Graphics g) + { + _battleship.DrawTransport(g); + } + } +} diff --git a/Battleship/Battleship/EntityBattleship.cs b/Battleship/Battleship/EntityBattleship.cs index ddcb788..00a13de 100644 --- a/Battleship/Battleship/EntityBattleship.cs +++ b/Battleship/Battleship/EntityBattleship.cs @@ -34,7 +34,7 @@ namespace Battleship /// /// /// - public void Init(int speed, float weight, Color bodyColor) + public EntityBattleship(int speed, float weight, Color bodyColor) { Random rnd = new(); Speed = speed <= 0 ? rnd.Next(50, 150) : speed; diff --git a/Battleship/Battleship/EntityGunBattleship.cs b/Battleship/Battleship/EntityGunBattleship.cs new file mode 100644 index 0000000..e25fc13 --- /dev/null +++ b/Battleship/Battleship/EntityGunBattleship.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Battleship +{ + /// + /// Класс-сущность "Военный корабль с оружием" + /// + internal class EntityGunBattleship : EntityBattleship + { + /// + /// Дополнительный цвет + /// + public Color DopColor { get; private set; } + /// + /// Признак наличия отсека для ракет + /// + public bool CompartmentRocket { get; private set; } + /// + /// Признак наличия орудийной башни + /// + public bool GunTower { get; private set; } + /// + /// Признак наличия забора на корме + /// + public bool SternFence { get; private set; } + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес военного корабля + /// Цвет корпуса корабля + /// Дополнительный цвет + /// Признак наличия отсека для ракет + /// Признак наличия орудийной башни + /// Признак наличия забора на корме + public EntityGunBattleship(int speed, float weight, Color bodyColor, Color dopColor, bool compartmentRocket, bool gunTower, bool sternFence) : + base(speed, weight, bodyColor) + { + DopColor = dopColor; + CompartmentRocket = compartmentRocket; + GunTower = gunTower; + SternFence = sternFence; + } + } +} diff --git a/Battleship/Battleship/FormBattleship.Designer.cs b/Battleship/Battleship/FormBattleship.Designer.cs index 299bcfd..fe452e7 100644 --- a/Battleship/Battleship/FormBattleship.Designer.cs +++ b/Battleship/Battleship/FormBattleship.Designer.cs @@ -29,15 +29,16 @@ private void InitializeComponent() { this.pictureBoxBattleship = new System.Windows.Forms.PictureBox(); - this.statusStripBattleship = new System.Windows.Forms.StatusStrip(); - this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel(); - this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel(); - this.toolStripStatusLabeBodylColor = new System.Windows.Forms.ToolStripStatusLabel(); this.buttonCreate = new System.Windows.Forms.Button(); this.buttonDown = new System.Windows.Forms.Button(); this.buttonUp = new System.Windows.Forms.Button(); this.buttonRight = new System.Windows.Forms.Button(); this.buttonLeft = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); + this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabeBodylColor = new System.Windows.Forms.ToolStripStatusLabel(); + this.statusStripBattleship = new System.Windows.Forms.StatusStrip(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBattleship)).BeginInit(); this.statusStripBattleship.SuspendLayout(); this.SuspendLayout(); @@ -53,36 +54,6 @@ this.pictureBoxBattleship.TabStop = false; this.pictureBoxBattleship.Resize += new System.EventHandler(this.PictureBoxBattleship_Resize); // - // statusStripBattleship - // - this.statusStripBattleship.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripStatusLabelSpeed, - this.toolStripStatusLabelWeight, - this.toolStripStatusLabeBodylColor}); - this.statusStripBattleship.Location = new System.Drawing.Point(0, 428); - this.statusStripBattleship.Name = "statusStripBattleship"; - this.statusStripBattleship.Size = new System.Drawing.Size(800, 22); - this.statusStripBattleship.TabIndex = 1; - this.statusStripBattleship.Text = "statusStrip1"; - // - // toolStripStatusLabelSpeed - // - this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; - this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(65, 17); - this.toolStripStatusLabelSpeed.Text = "Скорость: "; - // - // toolStripStatusLabelWeight - // - this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; - this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(32, 17); - this.toolStripStatusLabelWeight.Text = "Вес: "; - // - // toolStripStatusLabeBodylColor - // - this.toolStripStatusLabeBodylColor.Name = "toolStripStatusLabeBodylColor"; - this.toolStripStatusLabeBodylColor.Size = new System.Drawing.Size(36, 17); - this.toolStripStatusLabeBodylColor.Text = "Цвет:"; - // // buttonCreate // this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); @@ -138,12 +109,53 @@ this.buttonLeft.UseVisualStyleBackColor = true; this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); // + // buttonCreateModif + // + this.buttonCreateModif.Location = new System.Drawing.Point(93, 397); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(110, 23); + this.buttonCreateModif.TabIndex = 7; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(65, 17); + this.toolStripStatusLabelSpeed.Text = "Скорость: "; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(32, 17); + this.toolStripStatusLabelWeight.Text = "Вес: "; + // + // toolStripStatusLabeBodylColor + // + this.toolStripStatusLabeBodylColor.Name = "toolStripStatusLabeBodylColor"; + this.toolStripStatusLabeBodylColor.Size = new System.Drawing.Size(36, 17); + this.toolStripStatusLabeBodylColor.Text = "Цвет:"; + // + // statusStripBattleship + // + this.statusStripBattleship.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabeBodylColor}); + this.statusStripBattleship.Location = new System.Drawing.Point(0, 428); + this.statusStripBattleship.Name = "statusStripBattleship"; + this.statusStripBattleship.Size = new System.Drawing.Size(800, 22); + this.statusStripBattleship.TabIndex = 1; + this.statusStripBattleship.Text = "statusStrip1"; + // // FormBattleship // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSize = true; this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.buttonCreateModif); this.Controls.Add(this.buttonLeft); this.Controls.Add(this.buttonRight); this.Controls.Add(this.buttonUp); @@ -164,14 +176,15 @@ #endregion private PictureBox pictureBoxBattleship; - private StatusStrip statusStripBattleship; - private ToolStripStatusLabel toolStripStatusLabelSpeed; - private ToolStripStatusLabel toolStripStatusLabelWeight; - private ToolStripStatusLabel toolStripStatusLabeBodylColor; private Button buttonCreate; private Button buttonDown; private Button buttonUp; private Button buttonRight; private Button buttonLeft; + private Button buttonCreateModif; + private ToolStripStatusLabel toolStripStatusLabelSpeed; + private ToolStripStatusLabel toolStripStatusLabelWeight; + private ToolStripStatusLabel toolStripStatusLabeBodylColor; + private StatusStrip statusStripBattleship; } } \ No newline at end of file diff --git a/Battleship/Battleship/FormBattleship.cs b/Battleship/Battleship/FormBattleship.cs index 00d8b54..534d5d6 100644 --- a/Battleship/Battleship/FormBattleship.cs +++ b/Battleship/Battleship/FormBattleship.cs @@ -10,7 +10,7 @@ namespace Battleship } /// - /// + /// /// private void Draw() { @@ -20,20 +20,26 @@ namespace Battleship pictureBoxBattleship.Image = bmp; } /// - /// "" - /// - /// - /// - - private void ButtonCreate_Click(object sender, EventArgs e) + /// + /// + private void SetData() { Random rnd = new(); - _battleship = new DrawningBattleship(); - _battleship.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); _battleship.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxBattleship.Width, pictureBoxBattleship.Height); toolStripStatusLabelSpeed.Text = $": {_battleship.Battleship.Speed}"; toolStripStatusLabelWeight.Text = $": {_battleship.Battleship.Weight}"; toolStripStatusLabeBodylColor.Text = $": {_battleship.Battleship.BodyColor.Name}"; + } + /// + /// "" + /// + /// + /// + private void ButtonCreate_Click(object sender, EventArgs e) + { + Random rnd = new(); + _battleship = new DrawningBattleship(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + SetData(); Draw(); } /// @@ -72,5 +78,20 @@ namespace Battleship _battleship?.ChangeBorders(pictureBoxBattleship.Width, pictureBoxBattleship.Height); Draw(); } + /// + /// "" + /// + /// + /// + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + _battleship = new DrawningGunBattleship(rnd.Next(100, 300), rnd.Next(1000, 2000), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); + SetData(); + Draw(); + } } } \ No newline at end of file diff --git a/Battleship/Battleship/FormBattleship.resx b/Battleship/Battleship/FormBattleship.resx index dd36fec..8cfaecb 100644 --- a/Battleship/Battleship/FormBattleship.resx +++ b/Battleship/Battleship/FormBattleship.resx @@ -60,4 +60,7 @@ 17, 17 + + 25 + \ No newline at end of file diff --git a/Battleship/Battleship/FormMap.Designer.cs b/Battleship/Battleship/FormMap.Designer.cs new file mode 100644 index 0000000..2cb8b9a --- /dev/null +++ b/Battleship/Battleship/FormMap.Designer.cs @@ -0,0 +1,205 @@ +namespace Battleship +{ + 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.pictureBoxBattleship = new System.Windows.Forms.PictureBox(); + this.buttonCreate = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonUp = new System.Windows.Forms.Button(); + this.buttonRight = new System.Windows.Forms.Button(); + this.buttonLeft = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); + this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabeBodylColor = new System.Windows.Forms.ToolStripStatusLabel(); + this.statusStripBattleship = new System.Windows.Forms.StatusStrip(); + this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBattleship)).BeginInit(); + this.statusStripBattleship.SuspendLayout(); + this.SuspendLayout(); + // + // pictureBoxBattleship + // + this.pictureBoxBattleship.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBoxBattleship.Location = new System.Drawing.Point(0, 0); + this.pictureBoxBattleship.Name = "pictureBoxBattleship"; + this.pictureBoxBattleship.Size = new System.Drawing.Size(800, 450); + this.pictureBoxBattleship.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBoxBattleship.TabIndex = 0; + this.pictureBoxBattleship.TabStop = false; + // + // 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(12, 397); + this.buttonCreate.Name = "buttonCreate"; + this.buttonCreate.Size = new System.Drawing.Size(75, 23); + this.buttonCreate.TabIndex = 2; + this.buttonCreate.Text = "Создание"; + this.buttonCreate.UseVisualStyleBackColor = true; + this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click); + // + // buttonDown + // + this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonDown.BackgroundImage = global::Battleship.Properties.Resources.BatteleshipDown; + this.buttonDown.Location = new System.Drawing.Point(731, 390); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(30, 30); + this.buttonDown.TabIndex = 3; + this.buttonDown.UseVisualStyleBackColor = true; + this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonUp + // + this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonUp.BackgroundImage = global::Battleship.Properties.Resources.BattleshipUp; + this.buttonUp.Location = new System.Drawing.Point(732, 361); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(30, 30); + this.buttonUp.TabIndex = 4; + this.buttonUp.UseVisualStyleBackColor = true; + this.buttonUp.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::Battleship.Properties.Resources.BattleshipRight; + this.buttonRight.Location = new System.Drawing.Point(758, 390); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(30, 30); + this.buttonRight.TabIndex = 5; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.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::Battleship.Properties.Resources.BattleshipLeft; + this.buttonLeft.Location = new System.Drawing.Point(706, 390); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(30, 30); + this.buttonLeft.TabIndex = 6; + this.buttonLeft.UseVisualStyleBackColor = true; + this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonCreateModif + // + this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreateModif.Location = new System.Drawing.Point(93, 397); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(110, 23); + this.buttonCreateModif.TabIndex = 7; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(65, 17); + this.toolStripStatusLabelSpeed.Text = "Скорость: "; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(32, 17); + this.toolStripStatusLabelWeight.Text = "Вес: "; + // + // toolStripStatusLabeBodylColor + // + this.toolStripStatusLabeBodylColor.Name = "toolStripStatusLabeBodylColor"; + this.toolStripStatusLabeBodylColor.Size = new System.Drawing.Size(36, 17); + this.toolStripStatusLabeBodylColor.Text = "Цвет:"; + // + // statusStripBattleship + // + this.statusStripBattleship.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabeBodylColor}); + this.statusStripBattleship.Location = new System.Drawing.Point(0, 428); + this.statusStripBattleship.Name = "statusStripBattleship"; + this.statusStripBattleship.Size = new System.Drawing.Size(800, 22); + this.statusStripBattleship.TabIndex = 1; + this.statusStripBattleship.Text = "statusStrip1"; + // + // comboBoxSelectorMap + // + this.comboBoxSelectorMap.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxSelectorMap.FormattingEnabled = true; + this.comboBoxSelectorMap.Items.AddRange(new object[] { + "Простая карта", + "Водная карта"}); + this.comboBoxSelectorMap.Location = new System.Drawing.Point(209, 397); + this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; + this.comboBoxSelectorMap.Size = new System.Drawing.Size(121, 23); + this.comboBoxSelectorMap.TabIndex = 8; + this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); + // + // FormMap + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoSize = true; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.comboBoxSelectorMap); + this.Controls.Add(this.buttonCreateModif); + this.Controls.Add(this.buttonLeft); + this.Controls.Add(this.buttonRight); + this.Controls.Add(this.buttonUp); + this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.statusStripBattleship); + this.Controls.Add(this.pictureBoxBattleship); + this.Name = "FormMap"; + this.Text = "Военный корабль "; + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBattleship)).EndInit(); + this.statusStripBattleship.ResumeLayout(false); + this.statusStripBattleship.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + #endregion + private PictureBox pictureBoxBattleship; + private Button buttonCreate; + private Button buttonDown; + private Button buttonUp; + private Button buttonRight; + private Button buttonLeft; + private Button buttonCreateModif; + private ToolStripStatusLabel toolStripStatusLabelSpeed; + private ToolStripStatusLabel toolStripStatusLabelWeight; + private ToolStripStatusLabel toolStripStatusLabeBodylColor; + private StatusStrip statusStripBattleship; + private ComboBox comboBoxSelectorMap; + } +} \ No newline at end of file diff --git a/Battleship/Battleship/FormMap.cs b/Battleship/Battleship/FormMap.cs new file mode 100644 index 0000000..f0a2a89 --- /dev/null +++ b/Battleship/Battleship/FormMap.cs @@ -0,0 +1,104 @@ +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 Battleship +{ + public partial class FormMap : Form + { + private AbstractMap _abstractMap; + + public FormMap() + { + InitializeComponent(); + _abstractMap = new SimpleMap(); + } + /// + /// Заполнение информации по объекту + /// + /// + private void SetData(DrawningBattleship battleship) + { + toolStripStatusLabelSpeed.Text = $"Скорость: {battleship.Battleship.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {battleship.Battleship.Weight}"; + toolStripStatusLabeBodylColor.Text = $"Цвет: {battleship.Battleship.BodyColor.Name}"; + pictureBoxBattleship.Image = _abstractMap.CreateMap(pictureBoxBattleship.Width, pictureBoxBattleship.Height, + new DrawningObjectBattleship(battleship)); + } + /// + /// Обработка нажатия кнопки "Создать" + /// + /// + /// + private void ButtonCreate_Click(object sender, EventArgs e) + { + Random rnd = new(); + var car = new DrawningBattleship(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + SetData(car); + } + /// + /// Изменение размеров формы + /// + /// + /// + 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; + } + pictureBoxBattleship.Image = _abstractMap?.MoveObject(dir); + } + /// + /// Обработка нажатия кнопки "Модификация" + /// + /// + /// + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + var car = new DrawningGunBattleship(rnd.Next(100, 300), rnd.Next(1000, 2000), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); + SetData(car); + } + /// + /// Смена карты + /// + /// + /// + private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxSelectorMap.Text) + { + case "Простая карта": + _abstractMap = new SimpleMap(); + break; + case "Водная карта": + _abstractMap = new WaterMap(); + break; + } + } + } +} diff --git a/Battleship/Battleship/FormMap.resx b/Battleship/Battleship/FormMap.resx new file mode 100644 index 0000000..dd36fec --- /dev/null +++ b/Battleship/Battleship/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/Battleship/Battleship/IDrawningObject.cs b/Battleship/Battleship/IDrawningObject.cs new file mode 100644 index 0000000..8749a76 --- /dev/null +++ b/Battleship/Battleship/IDrawningObject.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Battleship +{ + /// + /// Интерфейс для работы с объектом, прорисовываемым на форме + /// + internal interface IDrawningObject + { + /// + /// Шаг перемещения объекта + /// + public float Step { get; } + /// + /// Установка позиции объекта + /// + /// Координата X + /// Координата Y + /// Ширина полотна + /// Высота полотна + void SetObject(int x, int y, int width, int height); + /// + /// Изменение направления пермещения объекта + /// + /// Направление + /// + void MoveObject(Direction direction); + /// + /// Отрисовка объекта + /// + /// + void DrawningObject(Graphics g); + /// + /// Получение текущей позиции объекта + /// + /// + (float Left, float Right, float Top, float Bottom) GetCurrentPosition(); + } +} diff --git a/Battleship/Battleship/Program.cs b/Battleship/Battleship/Program.cs index 4d0e539..14fd6f5 100644 --- a/Battleship/Battleship/Program.cs +++ b/Battleship/Battleship/Program.cs @@ -11,7 +11,7 @@ namespace Battleship // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormBattleship()); + Application.Run(new FormMap()); } } } \ No newline at end of file diff --git a/Battleship/Battleship/SimpleMap.cs b/Battleship/Battleship/SimpleMap.cs new file mode 100644 index 0000000..f030d9e --- /dev/null +++ b/Battleship/Battleship/SimpleMap.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Battleship +{ + /// + /// Простая реализация абсрактного класса 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 * (_size_x+1), j * (_size_y+1)); + } + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x+1), j * (_size_y+1)); + } + protected override void GenerateMap() + { + _map = new int[100, 100]; + _size_x = (float)_width / _map.GetLength(0); + _size_y = (float)_height / _map.GetLength(1); + int counter = 0; + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + _map[i, j] = _freeRoad; + } + } + while (counter < 50) + { + int x = _random.Next(0, 100); + int y = _random.Next(0, 100); + if (_map[x, y] == _freeRoad) + { + _map[x, y] = _barrier; + counter++; + } + } + } + } +} diff --git a/Battleship/Battleship/WaterMap.cs b/Battleship/Battleship/WaterMap.cs new file mode 100644 index 0000000..c446065 --- /dev/null +++ b/Battleship/Battleship/WaterMap.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Battleship +{ + internal class WaterMap : AbstractMap + { + private readonly Brush barrierColor = new SolidBrush(Color.Red); + private readonly Brush lightGrassColor = new SolidBrush(Color.Blue); + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + } + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(lightGrassColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + } + protected override void GenerateMap() + { + _map = new int[100, 100]; + _size_x = (float)_width / _map.GetLength(0); + _size_y = (float)_height / _map.GetLength(1); + int counter = 0; + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + _map[i, j] = _freeRoad; + } + } + while (counter < 50) + { + int x = _random.Next(0, 100); + int y = _random.Next(0, 100); + if (_map[x, y] == _freeRoad) + { + _map[x, y] = _barrier; + counter++; + } + } + } + } +}