diff --git a/Sailboat/AbstractMap.cs b/Sailboat/AbstractMap.cs
new file mode 100644
index 0000000..9ab4222
--- /dev/null
+++ b/Sailboat/AbstractMap.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Sailboat
+{
+ internal abstract class AbstractMap
+ {
+ 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)
+ {
+ (float leftX, float topY, float rightX, float bottomY) = _drawingObject.GetCurrentPosition();
+
+ float boatWidth = rightX - leftX;
+ float boatHeight = bottomY - topY;
+ for (int i = 0; i < _map.GetLength(0); i++)
+ {
+ for (int j = 0; j < _map.GetLength(1); j++)
+ {
+ if (_map[i, j] == _barrier)
+ {
+ switch (direction)
+ {
+ case Direction.Up:
+ if (_size_y * (j + 1) >= topY - _drawingObject.Step && _size_y * (j + 1) < topY && _size_x * (i + 1) > leftX
+ && _size_x * (i + 1) <= rightX)
+ {
+ return DrawMapWithObject();
+ }
+ break;
+ case Direction.Down:
+ if (_size_y * j <= bottomY + _drawingObject.Step && _size_y * j > bottomY && _size_x * (i + 1) > leftX
+ && _size_x * (i + 1) <= rightX)
+ {
+ return DrawMapWithObject();
+ }
+ break;
+ case Direction.Left:
+ if (_size_x * (i + 1) >= leftX - _drawingObject.Step && _size_x * (i + 1) < leftX && _size_y * (j + 1) < bottomY
+ && _size_y * (j + 1) >= topY)
+ {
+ return DrawMapWithObject();
+ }
+ break;
+ case Direction.Right:
+ if (_size_x * i <= rightX + _drawingObject.Step && _size_x * i > leftX && _size_y * (j + 1) < bottomY
+ && _size_y * (j + 1) >= topY)
+ {
+ return DrawMapWithObject();
+ }
+ break;
+ }
+ }
+ }
+ }
+ if (true)
+ {
+ _drawingObject.MoveObject(direction);
+ }
+ return DrawMapWithObject();
+ }
+
+ private bool SetObjectOnMap()
+ {
+ (float leftX, float topY, float rightX, float bottomY) = _drawingObject.GetCurrentPosition();
+ if (_drawingObject == null || _map == null)
+ {
+ return false;
+ }
+
+ float boatWidth = rightX - leftX;
+ float boatHeight = bottomY - topY;
+
+ int x = _random.Next(0, 10);
+ int y = _random.Next(0, 10);
+ for (int i = 0; i < _map.GetLength(0); ++i)
+ {
+ for (int j = 0; j < _map.GetLength(1); ++j)
+ {
+ if (_map[i, j] == _barrier)
+ {
+ if (x + boatWidth >= _size_x * i && x <= _size_x * i && y + boatHeight > _size_y * j && y <= _size_y * j)
+ {
+ 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.DrawingObject(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/Sailboat/BoatForm.cs b/Sailboat/BoatForm.cs
index 3b6d46b..cbda23c 100644
--- a/Sailboat/BoatForm.cs
+++ b/Sailboat/BoatForm.cs
@@ -84,18 +84,6 @@ namespace Sailboat
_boat?.DrawTransport(gr);
pictureBoxBoat.Image = bmp;
}
-
-
- ///
- /// Изменение размеров формы
- ///
- ///
- ///
- private void PictureBoxCar_Resize(object sender, EventArgs e)
- {
- _boat?.ChangeBorders(pictureBoxBoat.Width, pictureBoxBoat.Height);
- Draw();
- }
///
/// Метод прорисовки машины
///
@@ -104,8 +92,7 @@ namespace Sailboat
Random rnd = new();
toolStripLabel_color.Text = $"Скорость: {_boat.Boat.Speed}";
toolStripLabel_weight.Text = $"Вес: {_boat.Boat.Weight}";
- toolStripLabel_color.Text = $"Цвет: { _boat.Boat.BodyColor.Name}";
-
+ toolStripLabel_color.Text = $"Цвет: { _boat.Boat.BodyColor.Name}";
}
}
}
diff --git a/Sailboat/Direction.cs b/Sailboat/Direction.cs
index f09407a..4a1f592 100644
--- a/Sailboat/Direction.cs
+++ b/Sailboat/Direction.cs
@@ -11,10 +11,11 @@ namespace Sailboat
///
internal enum Direction
{
+ None = 0,
Up = 1,
Down = 2,
Left = 3,
- Right = 4
+ Right = 4
}
}
diff --git a/Sailboat/DrawingBoat.cs b/Sailboat/DrawingBoat.cs
index 8698e70..1e8ee12 100644
--- a/Sailboat/DrawingBoat.cs
+++ b/Sailboat/DrawingBoat.cs
@@ -35,13 +35,13 @@ namespace Sailboat
///
/// Ширина отрисовки автомобиля
///
- private readonly int _boatWidth = 120;
+ private readonly int _boatWidth = 125;
///
/// Высота отрисовки автомобиля
///
private readonly int _boatHeight = 40;
///
- /// Инициализация свойств (метод инит принимал готовые параметры от боат
+ /// Инициализация свойств
///
/// Скорость
/// Вес автомобиля
@@ -66,14 +66,13 @@ namespace Sailboat
/// Высота картинки
public void SetPosition(int x, int y, int width, int height)
{
- if (x > 0 && y > 0 && x < width - _boatWidth && y < height - _boatHeight)
+ if (x >= 0 && y >= 0 && x < width - _boatWidth && y < height - _boatHeight)
{
_startPosX = x;
_startPosY = y;
_pictureWidth = width;
_pictureHeight = height;
}
-
}
///
/// Изменение направления перемещения
@@ -118,7 +117,7 @@ namespace Sailboat
}
}
///
- /// Отрисовка автомобиля
+ /// Отрисовка лодки
///
///
public virtual void DrawTransport(Graphics g)
diff --git a/Sailboat/DrawingObjectBoat.cs b/Sailboat/DrawingObjectBoat.cs
index c366516..ba6dfc1 100644
--- a/Sailboat/DrawingObjectBoat.cs
+++ b/Sailboat/DrawingObjectBoat.cs
@@ -24,7 +24,7 @@ namespace Sailboat
public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
{
- throw new NotImplementedException();
+ return _boat?.GetCurrentPosition() ?? default;
}
void IDrawingObject.MoveObject(Direction direction)
diff --git a/Sailboat/FormMap.Designer.cs b/Sailboat/FormMap.Designer.cs
new file mode 100644
index 0000000..6554cf1
--- /dev/null
+++ b/Sailboat/FormMap.Designer.cs
@@ -0,0 +1,211 @@
+
+namespace Sailboat
+{
+ 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.statusStrip1 = new System.Windows.Forms.StatusStrip();
+ this.toolStripLabel_speed = new System.Windows.Forms.ToolStripStatusLabel();
+ this.toolStripLabel_weight = new System.Windows.Forms.ToolStripStatusLabel();
+ this.toolStripLabel_color = new System.Windows.Forms.ToolStripStatusLabel();
+ this.pictureBoxBoat = new System.Windows.Forms.PictureBox();
+ this.btn_create = new System.Windows.Forms.Button();
+ this.btn_right = new System.Windows.Forms.Button();
+ this.btn_down = new System.Windows.Forms.Button();
+ this.btn_up = new System.Windows.Forms.Button();
+ this.btn_left = new System.Windows.Forms.Button();
+ this.btn_create_sailboat = new System.Windows.Forms.Button();
+ this.comboBoxMapSelector = new System.Windows.Forms.ComboBox();
+ this.statusStrip1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBoat)).BeginInit();
+ this.SuspendLayout();
+ //
+ // statusStrip1
+ //
+ this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
+ this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.toolStripLabel_speed,
+ this.toolStripLabel_weight,
+ this.toolStripLabel_color});
+ this.statusStrip1.Location = new System.Drawing.Point(0, 424);
+ this.statusStrip1.Name = "statusStrip1";
+ this.statusStrip1.Size = new System.Drawing.Size(800, 26);
+ this.statusStrip1.TabIndex = 0;
+ this.statusStrip1.Text = "statusStrip1";
+ //
+ // toolStripLabel_speed
+ //
+ this.toolStripLabel_speed.Name = "toolStripLabel_speed";
+ this.toolStripLabel_speed.Size = new System.Drawing.Size(76, 20);
+ this.toolStripLabel_speed.Text = "Скорость:";
+ //
+ // toolStripLabel_weight
+ //
+ this.toolStripLabel_weight.Name = "toolStripLabel_weight";
+ this.toolStripLabel_weight.Size = new System.Drawing.Size(36, 20);
+ this.toolStripLabel_weight.Text = "Вес:";
+ //
+ // toolStripLabel_color
+ //
+ this.toolStripLabel_color.Name = "toolStripLabel_color";
+ this.toolStripLabel_color.Size = new System.Drawing.Size(45, 20);
+ this.toolStripLabel_color.Text = "Цвет:";
+ //
+ // pictureBoxBoat
+ //
+ this.pictureBoxBoat.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.pictureBoxBoat.Location = new System.Drawing.Point(0, 0);
+ this.pictureBoxBoat.Name = "pictureBoxBoat";
+ this.pictureBoxBoat.Size = new System.Drawing.Size(800, 424);
+ this.pictureBoxBoat.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+ this.pictureBoxBoat.TabIndex = 1;
+ this.pictureBoxBoat.TabStop = false;
+ this.pictureBoxBoat.Resize += new System.EventHandler(this.btn_move_Click);
+ //
+ // btn_create
+ //
+ this.btn_create.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.btn_create.Location = new System.Drawing.Point(13, 13);
+ this.btn_create.Name = "btn_create";
+ this.btn_create.Size = new System.Drawing.Size(94, 29);
+ this.btn_create.TabIndex = 2;
+ this.btn_create.Text = "Создать";
+ this.btn_create.UseVisualStyleBackColor = true;
+ this.btn_create.Click += new System.EventHandler(this.btn_create_Click);
+ //
+ // btn_right
+ //
+ this.btn_right.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.btn_right.BackgroundImage = global::Sailboat.Properties.Resources.right;
+ this.btn_right.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+ this.btn_right.Location = new System.Drawing.Point(694, 392);
+ this.btn_right.Name = "btn_right";
+ this.btn_right.Size = new System.Drawing.Size(94, 29);
+ this.btn_right.TabIndex = 4;
+ this.btn_right.UseVisualStyleBackColor = true;
+ this.btn_right.Click += new System.EventHandler(this.btn_move_Click);
+ //
+ // btn_down
+ //
+ this.btn_down.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.btn_down.BackgroundImage = global::Sailboat.Properties.Resources.down;
+ this.btn_down.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+ this.btn_down.Location = new System.Drawing.Point(594, 392);
+ this.btn_down.Name = "btn_down";
+ this.btn_down.Size = new System.Drawing.Size(94, 29);
+ this.btn_down.TabIndex = 5;
+ this.btn_down.UseVisualStyleBackColor = true;
+ this.btn_down.Click += new System.EventHandler(this.btn_move_Click);
+ //
+ // btn_up
+ //
+ this.btn_up.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.btn_up.BackgroundImage = global::Sailboat.Properties.Resources.up;
+ this.btn_up.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+ this.btn_up.Location = new System.Drawing.Point(594, 357);
+ this.btn_up.Name = "btn_up";
+ this.btn_up.Size = new System.Drawing.Size(94, 29);
+ this.btn_up.TabIndex = 6;
+ this.btn_up.UseVisualStyleBackColor = true;
+ this.btn_up.Click += new System.EventHandler(this.btn_move_Click);
+ //
+ // btn_left
+ //
+ this.btn_left.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.btn_left.BackgroundImage = global::Sailboat.Properties.Resources.left;
+ this.btn_left.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+ this.btn_left.Location = new System.Drawing.Point(494, 391);
+ this.btn_left.Name = "btn_left";
+ this.btn_left.Size = new System.Drawing.Size(94, 29);
+ this.btn_left.TabIndex = 7;
+ this.btn_left.UseVisualStyleBackColor = true;
+ this.btn_left.Click += new System.EventHandler(this.btn_move_Click);
+ //
+ // btn_create_sailboat
+ //
+ this.btn_create_sailboat.Location = new System.Drawing.Point(113, 13);
+ this.btn_create_sailboat.Name = "btn_create_sailboat";
+ this.btn_create_sailboat.Size = new System.Drawing.Size(150, 29);
+ this.btn_create_sailboat.TabIndex = 8;
+ this.btn_create_sailboat.Text = "Создать парусник";
+ this.btn_create_sailboat.UseVisualStyleBackColor = true;
+ this.btn_create_sailboat.Click += new System.EventHandler(this.btn_create_sailboat_Click);
+ //
+ // comboBoxMapSelector
+ //
+ this.comboBoxMapSelector.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBoxMapSelector.FormattingEnabled = true;
+ this.comboBoxMapSelector.Items.AddRange(new object[] {
+ "Простая карта",
+ "Водная карта"});
+ this.comboBoxMapSelector.Location = new System.Drawing.Point(269, 14);
+ this.comboBoxMapSelector.Name = "comboBoxMapSelector";
+ this.comboBoxMapSelector.Size = new System.Drawing.Size(151, 28);
+ this.comboBoxMapSelector.TabIndex = 9;
+ this.comboBoxMapSelector.SelectedIndexChanged += new System.EventHandler(this.comboBoxMapSelector_SelectedIndexChanged);
+ //
+ // FormMap
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(800, 450);
+ this.Controls.Add(this.comboBoxMapSelector);
+ this.Controls.Add(this.btn_create_sailboat);
+ this.Controls.Add(this.btn_left);
+ this.Controls.Add(this.btn_up);
+ this.Controls.Add(this.btn_down);
+ this.Controls.Add(this.btn_right);
+ this.Controls.Add(this.btn_create);
+ this.Controls.Add(this.pictureBoxBoat);
+ this.Controls.Add(this.statusStrip1);
+ this.Name = "FormMap";
+ this.Click += new System.EventHandler(this.btn_move_Click);
+ this.statusStrip1.ResumeLayout(false);
+ this.statusStrip1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBoat)).EndInit();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.StatusStrip statusStrip1;
+ private System.Windows.Forms.ToolStripStatusLabel toolStripLabel_speed;
+ private System.Windows.Forms.ToolStripStatusLabel toolStripLabel_weight;
+ private System.Windows.Forms.ToolStripStatusLabel toolStripLabel_color;
+ private System.Windows.Forms.PictureBox pictureBoxBoat;
+ private System.Windows.Forms.Button btn_create;
+ private System.Windows.Forms.Button btn_right;
+ private System.Windows.Forms.Button btn_down;
+ private System.Windows.Forms.Button btn_up;
+ private System.Windows.Forms.Button btn_left;
+ private System.Windows.Forms.Button btn_create_sailboat;
+ private System.Windows.Forms.ComboBox comboBoxMapSelector;
+ }
+}
\ No newline at end of file
diff --git a/Sailboat/FormMap.cs b/Sailboat/FormMap.cs
new file mode 100644
index 0000000..0fa666f
--- /dev/null
+++ b/Sailboat/FormMap.cs
@@ -0,0 +1,99 @@
+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 Sailboat
+{
+ public partial class FormMap : Form
+ {
+ private AbstractMap _abstractMap;
+ public FormMap()
+ {
+ InitializeComponent();
+ _abstractMap = new SimpleMap();
+ }
+ ///
+ /// Обработка нажатия кнопки "Создать"
+ ///
+ ///
+ ///
+ private void btn_create_Click(object sender, EventArgs e)
+ {
+ Random rnd = new();
+ var boat = new DrawingBoat(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 btn_create_sailboat_Click(object sender, EventArgs e)
+ {
+ Random rnd = new();
+ var boat = new DrawingSailboat(rnd.Next(100, 300), rnd.Next(1000, 2000),
+ Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
+ Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
+ SetData(boat);
+ }
+ ///
+ /// Обработка нажатия стрелок
+ ///
+ ///
+ ///
+ private void btn_move_Click(object sender, EventArgs e)
+ {
+ //получаем имя кнопки
+ string name = ((Button)sender)?.Name ?? string.Empty;
+ Direction dir = Direction.None;
+ switch (name)
+ {
+ case "btn_up":
+ dir = Direction.Up;
+ break;
+ case "btn_down":
+ dir = Direction.Down;
+ break;
+ case "btn_left":
+ dir = Direction.Left;
+ break;
+ case "btn_right":
+ dir = Direction.Right;
+ break;
+ }
+ pictureBoxBoat.Image = _abstractMap?.MoveObject(dir);
+ }
+ ///
+ /// Метод прорисовки машины
+ ///
+ private void SetData(DrawingBoat boat)
+ {
+ Random rnd = new();
+ toolStripLabel_color.Text = $"Скорость: {boat?.Boat.Speed}";
+ toolStripLabel_weight.Text = $"Вес: {boat?.Boat.Weight}";
+ toolStripLabel_color.Text = $"Цвет: { boat?.Boat.BodyColor.Name}";
+ pictureBoxBoat.Image = _abstractMap.CreateMap(pictureBoxBoat.Width, pictureBoxBoat.Height,
+ new DrawingObjectBoat(boat));
+ }
+
+ private void comboBoxMapSelector_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ switch (comboBoxMapSelector.Text)
+ {
+ case "Простая карта":
+ _abstractMap = new SimpleMap();
+ break;
+ case "Водная карта":
+ _abstractMap = new WaterMap();
+ break;
+ }
+ }
+ }
+}
diff --git a/Sailboat/FormMap.resx b/Sailboat/FormMap.resx
new file mode 100644
index 0000000..5cb320f
--- /dev/null
+++ b/Sailboat/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/Sailboat/Program.cs b/Sailboat/Program.cs
index 1ab8bf2..76ebb69 100644
--- a/Sailboat/Program.cs
+++ b/Sailboat/Program.cs
@@ -17,7 +17,7 @@ namespace Sailboat
Application.SetHighDpiMode(HighDpiMode.SystemAware);
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
- Application.Run(new BoatForm());
+ Application.Run(new FormMap());
}
}
}
diff --git a/Sailboat/SimpleMap.cs b/Sailboat/SimpleMap.cs
new file mode 100644
index 0000000..cd4e7dc
--- /dev/null
+++ b/Sailboat/SimpleMap.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Sailboat
+{
+ ///
+ /// Простая реализация абсрактного класса 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/Sailboat/WaterMap.cs b/Sailboat/WaterMap.cs
new file mode 100644
index 0000000..b1f5277
--- /dev/null
+++ b/Sailboat/WaterMap.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Sailboat
+{
+ internal class WaterMap : AbstractMap
+ {
+ private readonly Brush barrierColor = new SolidBrush(Color.Black);
+ private readonly Brush wavesColor = new SolidBrush(Color.Blue);
+ private readonly Brush deepColor = new SolidBrush(Color.DarkBlue);
+ 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)
+ {
+ Random rnd = new Random();
+ if (rnd.Next(0, 7) == 6)
+ {
+ g.FillRectangle(wavesColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
+ }
+ else
+ {
+ g.FillRectangle(deepColor, 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++;
+ }
+ }
+ }
+ }
+}