diff --git a/MotorBoat/MotorBoat/AbstractMap.cs b/MotorBoat/MotorBoat/AbstractMap.cs
new file mode 100644
index 0000000..413d614
--- /dev/null
+++ b/MotorBoat/MotorBoat/AbstractMap.cs
@@ -0,0 +1,203 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+ 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)
+ {
+ // TODO проверка, что объект может переместится в требуемом направлении
+ (float leftX, float topY, float rightX, float bottomY) = _drawningObject.GetCurrentPosition();
+ bool can = true;
+
+ int topYinS = Convert.ToInt32((topY) / _size_y);
+ int rightXinS = Convert.ToInt32((rightX) / _size_x);
+ int leftXinS = Convert.ToInt32((leftX) / _size_x);
+ int bottomYinS = Convert.ToInt32(bottomY / _size_y);
+
+ int stepinS = 0;
+
+ switch (direction)
+ {
+ case Direction.Up:
+ stepinS = Convert.ToInt32((topY - _drawningObject.Step) / _size_y);
+ if (stepinS < 0) stepinS = 0;
+ if (stepinS != topYinS)
+ {
+ for (int j = topYinS; j > stepinS; j--)
+ {
+ for (int i = leftXinS; i < rightXinS; i++)
+ {
+ if (_map[i, j] == _barrier)
+ {
+ can = false;
+ }
+ }
+ }
+ if (!can)
+ {
+ return DrawMapWithObject();
+ }
+ _drawningObject.MoveObject(direction);
+ }
+ return DrawMapWithObject();
+
+ case Direction.Down:
+ stepinS = Convert.ToInt32((bottomY + _drawningObject.Step) / _size_y);
+ if (stepinS > _height) stepinS = _height;
+ if (stepinS != topYinS)
+ {
+ for (int j = topYinS; j < stepinS; j++)
+ {
+ for (int i = leftXinS; i < rightXinS; i++)
+ {
+ if (_map[i, j] == _barrier)
+ {
+ can = false;
+ }
+ }
+ }
+ if (!can)
+ {
+ return DrawMapWithObject();
+ }
+ _drawningObject.MoveObject(direction);
+ }
+ return DrawMapWithObject();
+
+ case Direction.Left:
+ stepinS = Convert.ToInt32((leftX - _drawningObject.Step) / _size_x);
+ if (stepinS < 0) stepinS = 0;
+ if (stepinS != leftXinS)
+ {
+ for (int j = topYinS; j < bottomYinS; j++)
+ {
+ for (int i = leftXinS; i > stepinS; i--)
+ {
+ if (_map[i, j] == _barrier)
+ {
+ can = false;
+ }
+ }
+ }
+ if (!can)
+ {
+ return DrawMapWithObject();
+ }
+ _drawningObject.MoveObject(direction);
+ }
+ return DrawMapWithObject();
+
+ case Direction.Right:
+ stepinS = Convert.ToInt32((rightX + _drawningObject.Step) / _size_x);
+ if (stepinS > _width) stepinS = _width;
+ if (stepinS != leftXinS)
+ {
+ for (int j = topYinS; j < bottomYinS; j++)
+ {
+ for (int i = rightXinS; i < stepinS; i++)
+ {
+ if (_map[i, j] == _barrier)
+ {
+ can = false;
+ }
+ }
+ }
+ if (!can)
+ {
+ return DrawMapWithObject();
+ }
+ _drawningObject.MoveObject(direction);
+ }
+ return DrawMapWithObject();
+ }
+ return DrawMapWithObject();
+ }
+ private bool SetObjectOnMap()
+ {
+ if (_drawningObject == null || _map == null)
+ {
+ return false;
+ }
+ int x = _random.Next(0, 10);
+ int y = _random.Next(0, 10);
+ _drawningObject.SetObject(x, y, _width, _height);
+ // TODO првоерка, что объект не "накладывается" на закрытые участки
+ (float leftX, float topY, float rightX, float bottomY) = _drawningObject.GetCurrentPosition();
+ //координаты лодки в "клетках" массива карты
+ int topYinS = Convert.ToInt32(topY / _size_y);
+ int rightXinS = Convert.ToInt32(rightX / _size_x);
+ int leftXinS = Convert.ToInt32(leftX / _size_x);
+ int bottomYinS = Convert.ToInt32(bottomY / _size_y);
+
+ if (leftXinS < 0 || bottomYinS > _height || topYinS<0 || rightX > _width) { return false; }
+
+ for (int j = topYinS; j <= bottomYinS; j++)
+ {
+ for (int i = leftXinS; i <= rightXinS; i++)
+ {
+ 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);
+ }
+}
diff --git a/MotorBoat/MotorBoat/Direction.cs b/MotorBoat/MotorBoat/Direction.cs
index f98bc7f..9ae1f69 100644
--- a/MotorBoat/MotorBoat/Direction.cs
+++ b/MotorBoat/MotorBoat/Direction.cs
@@ -8,9 +8,10 @@ namespace MotorBoat
{
internal enum Direction
{
+ None = 0,
Up = 1,
Down = 2,
Left = 3,
- Right = 4
+ Right = 4,
}
}
diff --git a/MotorBoat/MotorBoat/DrawningBoat.cs b/MotorBoat/MotorBoat/DrawningBoat.cs
new file mode 100644
index 0000000..1b834bf
--- /dev/null
+++ b/MotorBoat/MotorBoat/DrawningBoat.cs
@@ -0,0 +1,132 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+ class DrawningBoat
+ {
+ public EntityBoat Boat { get; protected set; }
+
+ protected float _startPosX;
+ protected float _startPosY;
+
+ private int? _pictureWidth = null;
+ private int? _pictureHeight = null;
+
+ private readonly int _boatWidth = 70;
+ private readonly int _boatHeight = 40;
+ public DrawningBoat(int speed, float weight, Color bodyColor)
+ {
+ Boat = new EntityBoat(speed, weight, bodyColor);
+ }
+ protected DrawningBoat(int speed, float weight, Color bodyColor, int boatWidth, int boatHeight) :
+ this(speed, weight, bodyColor)
+ {
+ _boatWidth = boatWidth;
+ _boatHeight = boatHeight;
+ }
+ public void SetPosition(int x, int y, int width, int height)
+ {
+ // TODO checks
+ _startPosX = x;
+ _startPosY = y;
+ _pictureWidth = width;
+ _pictureHeight = height;
+ if (_startPosX + _boatWidth > _pictureWidth) { _startPosX = 10; }
+ if (_startPosY - _boatHeight < 0) { _startPosY = _boatHeight + 10; }
+ if (_startPosY + _boatHeight > _pictureHeight) { _startPosY -= _boatHeight; }
+ }
+ public void MoveTransport(Direction direction)
+ {
+ if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
+ {
+ return;
+ }
+ switch (direction)
+ {
+ // вправо
+ case Direction.Right:
+ if (_startPosX + _boatWidth + Boat.Step < _pictureWidth)
+ {
+ _startPosX += Boat.Step;
+ }
+ break;
+ //влево
+ case Direction.Left:
+ if (_startPosX - Boat.Step > 0)
+ {
+ _startPosX -= Boat.Step;
+ }
+ break;
+ //вверх
+ case Direction.Up:
+ if (_startPosY - _boatHeight - Boat.Step > 0)
+ {
+ _startPosY -= Boat.Step;
+ }
+ break;
+ //вниз
+ case Direction.Down:
+ if (_startPosY + _boatHeight + Boat.Step < _pictureHeight)
+ {
+ _startPosY += Boat.Step;
+ }
+ break;
+ }
+ }
+ public virtual void DrawTransport(Graphics g)
+ {
+ if (_startPosX < 0 || _startPosY < 0
+ || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
+ {
+ return;
+ }
+ Pen pen = new Pen(Color.Black);
+ //границы лодки
+ Point[] points = new Point[5]
+ {
+ new Point(Convert.ToInt32(_startPosX),Convert.ToInt32(_startPosY)),
+ new Point(Convert.ToInt32(_startPosX + 50),Convert.ToInt32(_startPosY)),
+ new Point(Convert.ToInt32(_startPosX + 70),Convert.ToInt32(_startPosY - 20)),
+ new Point(Convert.ToInt32(_startPosX + 50),Convert.ToInt32(_startPosY - 40)),
+ new Point(Convert.ToInt32(_startPosX),Convert.ToInt32(_startPosY-40)),
+ };
+
+ Brush brBody = new SolidBrush(Boat?.BodyColor ?? Color.Black);
+ g.FillPolygon(brBody, points);
+ g.DrawPolygon(pen, points);
+
+ Brush brYellow = new SolidBrush(Color.Yellow);
+ g.FillEllipse(brYellow, _startPosX + 5, _startPosY - 30, 50, 20);
+ g.DrawEllipse(pen, _startPosX + 5, _startPosY - 30, 50, 20);
+
+ }
+ public void ChangeBorders(int width, int height)
+ {
+ _pictureWidth = width;
+ _pictureHeight = height;
+ if (_pictureWidth <= _boatWidth || _pictureHeight <= _boatHeight)
+ {
+ _pictureWidth = null;
+ _pictureHeight = null;
+ return;
+ }
+ if (_startPosX + _boatWidth > _pictureWidth)
+ {
+ _startPosX = _pictureWidth.Value - _boatWidth;
+ }
+ if (_startPosY + _boatHeight > _pictureHeight)
+ {
+ _startPosY = _pictureHeight.Value - _boatHeight;
+ }
+ }
+ public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+ {
+ return (_startPosX, _startPosY, _startPosX + _boatWidth, _startPosY + _boatHeight);
+ }
+ }
+}
diff --git a/MotorBoat/MotorBoat/DrawningMotorBoat.cs b/MotorBoat/MotorBoat/DrawningMotorBoat.cs
index 1764659..4988ec3 100644
--- a/MotorBoat/MotorBoat/DrawningMotorBoat.cs
+++ b/MotorBoat/MotorBoat/DrawningMotorBoat.cs
@@ -1,123 +1,95 @@
using System;
using System.Collections.Generic;
-using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MotorBoat
{
- class DrawningMotorBoat
+ internal class DrawningMotorBoat : DrawningBoat
{
- public EntityMotorBoat Boat { get; private set; }
-
- private float _startPosX;
- private float _startPosY;
-
- private int? _pictureWidth = null;
- private int? _pictureHeight = null;
-
- private readonly int _boatWidth = 70;
- private readonly int _boatHeight = 40;
- public void Init(int speed, float weight, Color bodyColor)
+ /// Скорость
+ /// Вес автомобиля
+ /// Цвет кузова
+ /// Дополнительный цвет
+ /// Признак наличия обвеса
+ /// Признак наличия антикрыла
+ /// Признак наличия гоночной полосы
+ public DrawningMotorBoat(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) :
+ base(speed, weight, bodyColor, 110, 60)
{
- Boat = new EntityMotorBoat();
- Boat.Init(speed, weight, bodyColor);
+ Boat = new EntityMotorBoat(speed, weight, bodyColor, dopColor, bodyKit, wing, sportLine);
}
- public void SetPosition(int x, int y, int width, int height)
+ public override void DrawTransport(Graphics g)
{
- // TODO checks
- _startPosX = x;
- _startPosY = y;
- _pictureWidth = width;
- _pictureHeight = height;
- if (_startPosX + _boatWidth > _pictureWidth) { _startPosX = 10; }
- if (_startPosY - _boatHeight < 0) { _startPosY = _boatHeight + 10; }
- if (_startPosY + _boatHeight > _pictureHeight) { _startPosY -= _boatHeight; }
- }
- public void MoveBoats(Direction direction)
- {
- if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
+ if (Boat is not EntityMotorBoat motorBoat)
{
return;
}
- switch (direction)
- {
- // вправо
- case Direction.Right:
- if (_startPosX + _boatWidth + Boat.Step < _pictureWidth)
- {
- _startPosX += Boat.Step;
- }
- break;
- //влево
- case Direction.Left:
- if (_startPosX - Boat.Step > 0)
- {
- _startPosX -= Boat.Step;
- }
- break;
- //вверх
- case Direction.Up:
- if (_startPosY - _boatHeight - Boat.Step > 0)
- {
- _startPosY -= Boat.Step;
- }
- break;
- //вниз
- case Direction.Down:
- if (_startPosY + _boatHeight + Boat.Step < _pictureHeight)
- {
- _startPosY += Boat.Step;
- }
- break;
- }
- }
- public void DrawTransport(Graphics g)
- {
- if (_startPosX < 0 || _startPosY < 0
- || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
- {
- return;
- }
- Pen pen = new Pen(Color.Black);
- //границы лодки
- Point[] points = new Point[5]
- {
- new Point(Convert.ToInt32(_startPosX),Convert.ToInt32(_startPosY)),
- new Point(Convert.ToInt32(_startPosX + 50),Convert.ToInt32(_startPosY)),
- new Point(Convert.ToInt32(_startPosX + 70),Convert.ToInt32(_startPosY - 20)),
- new Point(Convert.ToInt32(_startPosX + 50),Convert.ToInt32(_startPosY - 40)),
- new Point(Convert.ToInt32(_startPosX),Convert.ToInt32(_startPosY-40)),
- };
+ Point[] points;
+ Pen pen = new(Color.Black);
+ Brush dopBrush = new SolidBrush(motorBoat.DopColor);
+
+ g.FillEllipse(new SolidBrush(Color.Black), _startPosX - 17, _startPosY - 24, 14, 5);
+ g.FillEllipse(new SolidBrush(Color.Black), _startPosX - 17, _startPosY - 21, 14, 5);
+ g.FillRectangle(dopBrush, _startPosX - 10, _startPosY - 30, 10, 20);
+ g.DrawRectangle(pen, _startPosX - 10, _startPosY - 30, 10, 20);
+
+ if (motorBoat.BodyKit)
+ {
+ points = new Point[]
+ {
+ new Point(Convert.ToInt32(_startPosX),Convert.ToInt32(_startPosY-50)),
+ new Point(Convert.ToInt32(_startPosX),Convert.ToInt32(_startPosY+10)),
+ new Point(Convert.ToInt32(_startPosX+50),Convert.ToInt32(_startPosY)),
+ new Point(Convert.ToInt32(_startPosX+50),Convert.ToInt32(_startPosY-40)),
+ };
+ g.FillPolygon(dopBrush, points);
+ g.DrawPolygon(pen, points);
+ }
+
+ if (motorBoat.Wing)
+ {
+ points = new Point[]
+ {
+ new Point(Convert.ToInt32(_startPosX)+50,Convert.ToInt32(_startPosY-40)),
+ new Point(Convert.ToInt32(_startPosX)+80,Convert.ToInt32(_startPosY-20)),
+ new Point(Convert.ToInt32(_startPosX+50),Convert.ToInt32(_startPosY)),
+ };
+ g.FillPolygon(dopBrush, points);
+ g.DrawPolygon(pen, points);
+ }
+
+ base.DrawTransport(g);
+ points = new Point[]
+ {
+ new Point(Convert.ToInt32(_startPosX)+50,Convert.ToInt32(_startPosY-34)),
+ new Point(Convert.ToInt32(_startPosX)+57,Convert.ToInt32(_startPosY-20)),
+ new Point(Convert.ToInt32(_startPosX+50),Convert.ToInt32(_startPosY-6)),
+ };
+ g.FillPolygon(new SolidBrush(Color.LightBlue), points);
g.DrawPolygon(pen, points);
- Brush brBody = new SolidBrush(Boat?.BodyColor ?? Color.Black);
- g.FillPolygon(brBody, points);
- g.DrawEllipse(pen, _startPosX + 5, _startPosY - 30, 50, 20);
- Brush brYellow = new SolidBrush(Color.Yellow);
- g.FillEllipse(brYellow, _startPosX + 5, _startPosY - 30, 50, 20);
-
- }
- public void ChangeBorders(int width, int height)
- {
- _pictureWidth = width;
- _pictureHeight = height;
- if (_pictureWidth <= _boatWidth || _pictureHeight <= _boatHeight)
+ if (motorBoat.SportLine)
{
- _pictureWidth = null;
- _pictureHeight = null;
- return;
- }
- if (_startPosX + _boatWidth > _pictureWidth)
- {
- _startPosX = _pictureWidth.Value - _boatWidth;
- }
- if (_startPosY + _boatHeight > _pictureHeight)
- {
- _startPosY = _pictureHeight.Value - _boatHeight;
- }
- }
+ points = new Point[]
+ {
+ new Point(Convert.ToInt32(_startPosX)+5,Convert.ToInt32(_startPosY-37)),
+ new Point(Convert.ToInt32(_startPosX)+5,Convert.ToInt32(_startPosY-30)),
+ new Point(Convert.ToInt32(_startPosX+35),Convert.ToInt32(_startPosY-37)),
+ };
+ g.FillPolygon(dopBrush, points);
+ g.DrawPolygon(pen, points);
+ points = new Point[]
+ {
+ new Point(Convert.ToInt32(_startPosX)+5,Convert.ToInt32(_startPosY-3)),
+ new Point(Convert.ToInt32(_startPosX)+5,Convert.ToInt32(_startPosY-10)),
+ new Point(Convert.ToInt32(_startPosX+35),Convert.ToInt32(_startPosY-3)),
+ };
+ g.FillPolygon(dopBrush, points);
+ g.DrawPolygon(pen, points);
+ }
+ }
}
}
diff --git a/MotorBoat/MotorBoat/DrawningObjectBoat.cs b/MotorBoat/MotorBoat/DrawningObjectBoat.cs
new file mode 100644
index 0000000..09a0531
--- /dev/null
+++ b/MotorBoat/MotorBoat/DrawningObjectBoat.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+ internal class DrawningObjectBoat : IDrawningObject
+ {
+ private DrawningBoat _boat = null;
+
+ public DrawningObjectBoat(DrawningBoat boat)
+ {
+ _boat = boat;
+ }
+
+ public float Step => _boat?.Boat?.Step ?? 0;
+
+ public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+ {
+ return _boat?.GetCurrentPosition() ?? default;
+ }
+
+ public void MoveObject(Direction direction)
+ {
+ _boat?.MoveTransport(direction);
+ }
+
+ public void SetObject(int x, int y, int width, int height)
+ {
+ _boat.SetPosition(x, y, width, height);
+ }
+
+ void IDrawningObject.DrawningObject(Graphics g)
+ {
+ _boat.DrawTransport(g);
+ }
+ }
+}
diff --git a/MotorBoat/MotorBoat/EntityBoat.cs b/MotorBoat/MotorBoat/EntityBoat.cs
new file mode 100644
index 0000000..2b1b66e
--- /dev/null
+++ b/MotorBoat/MotorBoat/EntityBoat.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+ class EntityBoat
+ {
+ public int Speed { get; private set; }
+ public float Weight { get; private set; }
+ public Color BodyColor { get; private set; }
+ public float Step => Speed * 100 / Weight;
+ public EntityBoat(int speed, float weight, Color bodyColor)
+ {
+ Random rnd = new Random();
+ Speed = speed <= 0 ? rnd.Next(50, 150) : speed;
+ Weight = weight <= 0 ? rnd.Next(40, 70) : weight;
+ BodyColor = bodyColor;
+ }
+ }
+}
diff --git a/MotorBoat/MotorBoat/EntityMotorBoat.cs b/MotorBoat/MotorBoat/EntityMotorBoat.cs
index c9daad9..e05cd37 100644
--- a/MotorBoat/MotorBoat/EntityMotorBoat.cs
+++ b/MotorBoat/MotorBoat/EntityMotorBoat.cs
@@ -1,24 +1,31 @@
using System;
using System.Collections.Generic;
-using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MotorBoat
{
- class EntityMotorBoat
+ internal class EntityMotorBoat : EntityBoat
{
- public int Speed { get; private set; }
- public float Weight { get; private set; }
- public Color BodyColor { get; private set; }
- public float Step => Speed * 100 / Weight;
- public void Init(int speed, float weight, Color bodyColor)
+ public Color DopColor { get; private set; }
+ public bool BodyKit { get; private set; }
+ public bool Wing { get; private set; }
+ public bool SportLine { get; private set; }
+ /// Скорость
+ /// Вес лодки
+ /// Цвет кузова
+ /// Дополнительный цвет
+ /// Признак наличия обвеса
+ /// Признак наличия антикрыла
+ /// Признак наличия гоночной полосы
+ public EntityMotorBoat(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) :
+ base(speed, weight, bodyColor)
{
- Random rnd = new Random();
- Speed = speed <= 0 ? rnd.Next(50, 150) : speed;
- Weight = weight <= 0 ? rnd.Next(40, 70) : weight;
- BodyColor = bodyColor;
+ DopColor = dopColor;
+ BodyKit = bodyKit;
+ Wing = wing;
+ SportLine = sportLine;
}
}
}
diff --git a/MotorBoat/MotorBoat/FormMotorBoat.Designer.cs b/MotorBoat/MotorBoat/FormBoat.Designer.cs
similarity index 89%
rename from MotorBoat/MotorBoat/FormMotorBoat.Designer.cs
rename to MotorBoat/MotorBoat/FormBoat.Designer.cs
index 611854f..d760163 100644
--- a/MotorBoat/MotorBoat/FormMotorBoat.Designer.cs
+++ b/MotorBoat/MotorBoat/FormBoat.Designer.cs
@@ -1,6 +1,6 @@
namespace MotorBoat
{
- partial class FormMotorBoat
+ partial class FormBoat
{
///
/// Required designer variable.
@@ -38,6 +38,7 @@
this.buttonLeft = new System.Windows.Forms.Button();
this.buttonDown = new System.Windows.Forms.Button();
this.buttonCreate = new System.Windows.Forms.Button();
+ this.buttonCreateModif = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxMotorBoat)).BeginInit();
this.statusStrip1.SuspendLayout();
this.SuspendLayout();
@@ -141,11 +142,23 @@
this.buttonCreate.UseVisualStyleBackColor = true;
this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click);
//
- // FormMotorBoat
+ // 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(133, 369);
+ this.buttonCreateModif.Name = "buttonCreateModif";
+ this.buttonCreateModif.Size = new System.Drawing.Size(111, 44);
+ this.buttonCreateModif.TabIndex = 6;
+ this.buttonCreateModif.Text = "Модификация";
+ this.buttonCreateModif.UseVisualStyleBackColor = true;
+ this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click);
+ //
+ // FormBoat
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 450);
+ this.Controls.Add(this.buttonCreateModif);
this.Controls.Add(this.buttonCreate);
this.Controls.Add(this.buttonDown);
this.Controls.Add(this.buttonLeft);
@@ -153,7 +166,7 @@
this.Controls.Add(this.buttonRight);
this.Controls.Add(this.pictureBoxMotorBoat);
this.Controls.Add(this.statusStrip1);
- this.Name = "FormMotorBoat";
+ this.Name = "FormBoat";
this.Text = "Моторная лодка";
((System.ComponentModel.ISupportInitialize)(this.pictureBoxMotorBoat)).EndInit();
this.statusStrip1.ResumeLayout(false);
@@ -175,5 +188,6 @@
private Button buttonLeft;
private Button buttonDown;
private Button buttonCreate;
+ private Button buttonCreateModif;
}
}
\ No newline at end of file
diff --git a/MotorBoat/MotorBoat/FormMotorBoat.cs b/MotorBoat/MotorBoat/FormBoat.cs
similarity index 53%
rename from MotorBoat/MotorBoat/FormMotorBoat.cs
rename to MotorBoat/MotorBoat/FormBoat.cs
index 03277b0..ed9b678 100644
--- a/MotorBoat/MotorBoat/FormMotorBoat.cs
+++ b/MotorBoat/MotorBoat/FormBoat.cs
@@ -8,23 +8,18 @@ using System.Windows.Forms;
namespace MotorBoat
{
- public partial class FormMotorBoat : Form
+ public partial class FormBoat : Form
{
- private DrawningMotorBoat _boat;
- public FormMotorBoat()
+ private DrawningBoat _boat;
+ public FormBoat()
{
InitializeComponent();
}
-
private void ButtonCreate_Click(object sender, EventArgs e)
{
Random rnd = new Random();
- _boat = new DrawningMotorBoat();
- _boat.Init(rnd.Next(50, 150), rnd.Next(100, 200), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
- _boat.SetPosition(rnd.Next(10, 100), rnd.Next(0,100), pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
- toolStripStatusLabelSpeed.Text = $": {_boat.Boat.Speed}";
- toolStripStatusLabelWeight.Text = $": {_boat.Boat.Weight}";
- toolStripStatusLabelBodyColor.Text = $": {_boat.Boat.BodyColor.Name}";
+ _boat = new DrawningBoat(rnd.Next(50, 150), rnd.Next(100, 200), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+ SetData();
Draw();
}
private void Draw()
@@ -34,7 +29,14 @@ namespace MotorBoat
_boat?.DrawTransport(gr);
pictureBoxMotorBoat.Image = bmp;
}
-
+ private void SetData()
+ {
+ Random rnd = new();
+ _boat.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
+ toolStripStatusLabelSpeed.Text = $": {_boat.Boat.Speed}";
+ toolStripStatusLabelWeight.Text = $": {_boat.Boat.Weight}";
+ toolStripStatusLabelBodyColor.Text = $": {_boat.Boat.BodyColor.Name}";
+ }
private void PictureBoxCar_Resize(object sender, EventArgs e)
{
_boat?.ChangeBorders(pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
@@ -48,19 +50,33 @@ namespace MotorBoat
switch (name)
{
case "buttonUp":
- _boat?.MoveBoats(Direction.Up);
+ _boat?.MoveTransport(Direction.Up);
break;
case "buttonDown":
- _boat?.MoveBoats(Direction.Down);
+ _boat?.MoveTransport(Direction.Down);
break;
case "buttonLeft":
- _boat?.MoveBoats(Direction.Left);
+ _boat?.MoveTransport(Direction.Left);
break;
case "buttonRight":
- _boat?.MoveBoats(Direction.Right);
+ _boat?.MoveTransport(Direction.Right);
break;
}
Draw();
}
+ /// ""
+ ///
+ ///
+ ///
+ private void buttonCreateModif_Click(object sender, EventArgs e)
+ {
+ Random rnd = new();
+ _boat = new DrawningMotorBoat(rnd.Next(100, 200), rnd.Next(100, 200),
+ 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();
+ }
}
}
diff --git a/MotorBoat/MotorBoat/FormMotorBoat.resx b/MotorBoat/MotorBoat/FormBoat.resx
similarity index 100%
rename from MotorBoat/MotorBoat/FormMotorBoat.resx
rename to MotorBoat/MotorBoat/FormBoat.resx
diff --git a/MotorBoat/MotorBoat/FormMap.Designer.cs b/MotorBoat/MotorBoat/FormMap.Designer.cs
new file mode 100644
index 0000000..c16d767
--- /dev/null
+++ b/MotorBoat/MotorBoat/FormMap.Designer.cs
@@ -0,0 +1,209 @@
+namespace MotorBoat
+{
+ 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.pictureBoxMotorBoat = new System.Windows.Forms.PictureBox();
+ this.statusStrip1 = 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.buttonRight = new System.Windows.Forms.Button();
+ this.buttonUp = new System.Windows.Forms.Button();
+ this.buttonLeft = new System.Windows.Forms.Button();
+ this.buttonDown = new System.Windows.Forms.Button();
+ this.buttonCreate = new System.Windows.Forms.Button();
+ this.buttonCreateModif = new System.Windows.Forms.Button();
+ this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxMotorBoat)).BeginInit();
+ this.statusStrip1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // pictureBoxMotorBoat
+ //
+ this.pictureBoxMotorBoat.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.pictureBoxMotorBoat.Location = new System.Drawing.Point(0, 0);
+ this.pictureBoxMotorBoat.Name = "pictureBoxMotorBoat";
+ this.pictureBoxMotorBoat.Size = new System.Drawing.Size(800, 428);
+ this.pictureBoxMotorBoat.TabIndex = 1;
+ this.pictureBoxMotorBoat.TabStop = false;
+ //
+ // statusStrip1
+ //
+ this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.toolStripStatusLabelSpeed,
+ this.toolStripStatusLabelWeight,
+ this.toolStripStatusLabelBodyColor});
+ this.statusStrip1.Location = new System.Drawing.Point(0, 428);
+ this.statusStrip1.Name = "statusStrip1";
+ this.statusStrip1.Size = new System.Drawing.Size(800, 22);
+ this.statusStrip1.TabIndex = 0;
+ this.statusStrip1.Text = "statusStrip1";
+ //
+ // toolStripStatusLabelSpeed
+ //
+ this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
+ this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(62, 17);
+ this.toolStripStatusLabelSpeed.Text = "Скорость:";
+ //
+ // toolStripStatusLabelWeight
+ //
+ this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
+ this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(29, 17);
+ this.toolStripStatusLabelWeight.Text = "Вес:";
+ //
+ // toolStripStatusLabelBodyColor
+ //
+ this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
+ this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(36, 17);
+ this.toolStripStatusLabelBodyColor.Text = "Цвет:";
+ //
+ // buttonRight
+ //
+ this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonRight.Image = global::MotorBoat.Properties.Resources.up;
+ this.buttonRight.Location = new System.Drawing.Point(715, 370);
+ this.buttonRight.Name = "buttonRight";
+ this.buttonRight.Size = new System.Drawing.Size(40, 40);
+ this.buttonRight.TabIndex = 2;
+ this.buttonRight.TabStop = false;
+ this.buttonRight.UseVisualStyleBackColor = true;
+ this.buttonRight.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.Image = global::MotorBoat.Properties.Resources.r;
+ this.buttonUp.Location = new System.Drawing.Point(669, 324);
+ this.buttonUp.Name = "buttonUp";
+ this.buttonUp.Size = new System.Drawing.Size(40, 40);
+ this.buttonUp.TabIndex = 3;
+ this.buttonUp.TabStop = false;
+ 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.Image = global::MotorBoat.Properties.Resources.left;
+ this.buttonLeft.Location = new System.Drawing.Point(623, 371);
+ this.buttonLeft.Name = "buttonLeft";
+ this.buttonLeft.Size = new System.Drawing.Size(40, 40);
+ this.buttonLeft.TabIndex = 4;
+ this.buttonLeft.TabStop = false;
+ this.buttonLeft.UseVisualStyleBackColor = true;
+ this.buttonLeft.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.Image = global::MotorBoat.Properties.Resources.d;
+ this.buttonDown.Location = new System.Drawing.Point(669, 370);
+ this.buttonDown.Name = "buttonDown";
+ this.buttonDown.Size = new System.Drawing.Size(40, 40);
+ this.buttonDown.TabIndex = 5;
+ this.buttonDown.TabStop = false;
+ this.buttonDown.UseVisualStyleBackColor = true;
+ this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
+ //
+ // 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(16, 370);
+ this.buttonCreate.Name = "buttonCreate";
+ this.buttonCreate.Size = new System.Drawing.Size(111, 44);
+ this.buttonCreate.TabIndex = 2;
+ this.buttonCreate.Text = "Создать";
+ this.buttonCreate.UseVisualStyleBackColor = true;
+ this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_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(133, 369);
+ this.buttonCreateModif.Name = "buttonCreateModif";
+ this.buttonCreateModif.Size = new System.Drawing.Size(111, 44);
+ this.buttonCreateModif.TabIndex = 6;
+ this.buttonCreateModif.Text = "Модификация";
+ this.buttonCreateModif.UseVisualStyleBackColor = true;
+ this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
+ //
+ // comboBoxSelectorMap
+ //
+ this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBoxSelectorMap.FormattingEnabled = true;
+ this.comboBoxSelectorMap.Items.AddRange(new object[] {
+ "Простая карта",
+ "Розовая карта",
+ "Морская карта"});
+ this.comboBoxSelectorMap.Location = new System.Drawing.Point(8, 8);
+ this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+ this.comboBoxSelectorMap.Size = new System.Drawing.Size(121, 23);
+ this.comboBoxSelectorMap.TabIndex = 7;
+ this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
+ //
+ // FormMap
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(800, 450);
+ this.Controls.Add(this.comboBoxSelectorMap);
+ this.Controls.Add(this.buttonCreateModif);
+ this.Controls.Add(this.buttonCreate);
+ this.Controls.Add(this.buttonDown);
+ this.Controls.Add(this.buttonLeft);
+ this.Controls.Add(this.buttonUp);
+ this.Controls.Add(this.buttonRight);
+ this.Controls.Add(this.pictureBoxMotorBoat);
+ this.Controls.Add(this.statusStrip1);
+ this.Name = "FormMap";
+ this.Text = "FormMap";
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxMotorBoat)).EndInit();
+ this.statusStrip1.ResumeLayout(false);
+ this.statusStrip1.PerformLayout();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+ private StatusStrip statusStrip1;
+ private ToolStripStatusLabel toolStripStatusLabelSpeed;
+ private ToolStripStatusLabel toolStripStatusLabelWeight;
+ private ToolStripStatusLabel toolStripStatusLabelBodyColor;
+ private PictureBox pictureBoxMotorBoat;
+ private Button buttonRight;
+ private Button buttonUp;
+ private Button buttonLeft;
+ private Button buttonDown;
+ private Button buttonCreate;
+ private Button buttonCreateModif;
+ private ComboBox comboBoxSelectorMap;
+ }
+}
\ No newline at end of file
diff --git a/MotorBoat/MotorBoat/FormMap.cs b/MotorBoat/MotorBoat/FormMap.cs
new file mode 100644
index 0000000..24b199d
--- /dev/null
+++ b/MotorBoat/MotorBoat/FormMap.cs
@@ -0,0 +1,107 @@
+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 MotorBoat
+{
+ public partial class FormMap : Form
+ {
+ private AbstractMap _abstractMap;
+
+ public FormMap()
+ {
+ InitializeComponent();
+ _abstractMap = new SimpleMap();
+ }
+ ///
+ /// Заполнение информации по объекту
+ ///
+ ///
+ private void SetData(DrawningBoat boat)
+ {
+ toolStripStatusLabelSpeed.Text = $"Скорость: {boat.Boat.Speed}";
+ toolStripStatusLabelWeight.Text = $"Вес: {boat.Boat.Weight}";
+ toolStripStatusLabelBodyColor.Text = $"Цвет: {boat.Boat.BodyColor.Name}";
+ pictureBoxMotorBoat.Image = _abstractMap.CreateMap(pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height,
+ new DrawningObjectBoat(boat));
+ }
+ ///
+ /// Обработка нажатия кнопки "Создать"
+ ///
+ ///
+ ///
+ private void ButtonCreate_Click(object sender, EventArgs e)
+ {
+ Random rnd = new();
+ var boat = new DrawningBoat(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+ SetData(boat);
+ }
+ ///
+ /// Изменение размеров формы
+ ///
+ ///
+ ///
+ 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;
+ }
+ pictureBoxMotorBoat.Image = _abstractMap?.MoveObject(dir);
+ }
+ ///
+ /// Обработка нажатия кнопки "Модификация"
+ ///
+ ///
+ ///
+ private void ButtonCreateModif_Click(object sender, EventArgs e)
+ {
+ Random rnd = new();
+ var boat = new DrawningMotorBoat(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(boat);
+ }
+ ///
+ /// Смена карты
+ ///
+ ///
+ ///
+ private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ switch (comboBoxSelectorMap.Text)
+ {
+ case "Простая карта":
+ _abstractMap = new SimpleMap();
+ break;
+ case "Розовая карта":
+ _abstractMap = new PinkMap();
+ break;
+ case "Морская карта":
+ _abstractMap = new SeaMap();
+ break;
+ }
+ }
+ }
+}
diff --git a/MotorBoat/MotorBoat/FormMap.resx b/MotorBoat/MotorBoat/FormMap.resx
new file mode 100644
index 0000000..5cb320f
--- /dev/null
+++ b/MotorBoat/MotorBoat/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/MotorBoat/MotorBoat/IDrawningObject.cs b/MotorBoat/MotorBoat/IDrawningObject.cs
new file mode 100644
index 0000000..68c9958
--- /dev/null
+++ b/MotorBoat/MotorBoat/IDrawningObject.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+ 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();
+ }
+}
\ No newline at end of file
diff --git a/MotorBoat/MotorBoat/PinkMap.cs b/MotorBoat/MotorBoat/PinkMap.cs
new file mode 100644
index 0000000..0a8140b
--- /dev/null
+++ b/MotorBoat/MotorBoat/PinkMap.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+ internal class PinkMap : AbstractMap
+ {
+ ///
+ /// Цвет участка закрытого
+ ///
+ private readonly Brush barrierColor = new SolidBrush(Color.Purple);
+ ///
+ /// Цвет участка открытого
+ ///
+ private readonly Brush roadColor = new SolidBrush(Color.LightPink);
+ protected override void DrawBarrierPart(Graphics g, int i, int j)
+ {
+ g.FillEllipse(barrierColor, i *( _size_x-1), j * (_size_y-1), 15, 10);
+ }
+ 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 < 40)
+ {
+ int x = _random.Next(1, 100);
+ int y = _random.Next(1, 100);
+ if (_map[x, y] == _freeRoad)
+ {
+ _map[x, y] = _barrier;
+ counter++;
+ }
+ }
+ }
+ }
+}
diff --git a/MotorBoat/MotorBoat/Program.cs b/MotorBoat/MotorBoat/Program.cs
index 83aea91..5f309a4 100644
--- a/MotorBoat/MotorBoat/Program.cs
+++ b/MotorBoat/MotorBoat/Program.cs
@@ -11,7 +11,7 @@ namespace MotorBoat
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
- Application.Run(new FormMotorBoat());
+ Application.Run(new FormMap());
}
}
}
\ No newline at end of file
diff --git a/MotorBoat/MotorBoat/SeaMap.cs b/MotorBoat/MotorBoat/SeaMap.cs
new file mode 100644
index 0000000..937d2f7
--- /dev/null
+++ b/MotorBoat/MotorBoat/SeaMap.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+ internal class SeaMap : AbstractMap
+ {
+ ///
+ /// Цвет участка закрытого
+ ///
+ private readonly Pen barrierColor = new Pen(Color.DarkBlue, 2);
+ ///
+ /// Цвет участка открытого
+ ///
+ private readonly Brush roadColor = new SolidBrush(Color.LightBlue);
+ protected override void DrawBarrierPart(Graphics g, int i, int j)
+ {
+ g.DrawArc(barrierColor, i * (_size_x - 1), j * (_size_y - 1), 7, 6, 0, 180);
+ g.DrawArc(barrierColor, i * (_size_x - 1) + 6, j * (_size_y - 1), 7, 6, 0, 180);
+ }
+ 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 < 40)
+ {
+ int x = _random.Next(1, 100);
+ int y = _random.Next(1, 100);
+ if (_map[x, y] == _freeRoad)
+ {
+ _map[x, y] = _barrier;
+ counter++;
+ }
+ }
+ }
+ }
+}
diff --git a/MotorBoat/MotorBoat/SimpleMap.cs b/MotorBoat/MotorBoat/SimpleMap.cs
new file mode 100644
index 0000000..ce40cab
--- /dev/null
+++ b/MotorBoat/MotorBoat/SimpleMap.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat
+{
+ 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++;
+ }
+ }
+ }
+ }
+}