diff --git a/Locomotive/Locomotive/FormMap.Designer.cs b/Locomotive/Locomotive/FormMap.Designer.cs index f3b9c62..e885489 100644 --- a/Locomotive/Locomotive/FormMap.Designer.cs +++ b/Locomotive/Locomotive/FormMap.Designer.cs @@ -160,7 +160,8 @@ this.comboBoxSelectorMap.FormattingEnabled = true; this.comboBoxSelectorMap.Items.AddRange(new object[] { "Простая карта", - "Карта с шипами"}); + "Карта с шипами", + "Карта с рельсами"}); this.comboBoxSelectorMap.Location = new System.Drawing.Point(12, 12); this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; this.comboBoxSelectorMap.Size = new System.Drawing.Size(151, 28); diff --git a/Locomotive/Locomotive/FormMap.cs b/Locomotive/Locomotive/FormMap.cs index bfd3a2f..4333523 100644 --- a/Locomotive/Locomotive/FormMap.cs +++ b/Locomotive/Locomotive/FormMap.cs @@ -89,6 +89,9 @@ namespace Locomotive case "Карта с шипами": _abstractMap = new SpikeMap(); break; + case "Карта с рельсами": + _abstractMap = new RailroadMap(); + break; } } diff --git a/Locomotive/Locomotive/RailroadMap.cs b/Locomotive/Locomotive/RailroadMap.cs new file mode 100644 index 0000000..f532e07 --- /dev/null +++ b/Locomotive/Locomotive/RailroadMap.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Locomotive +{ + internal class RailroadMap : 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 < 1) + { + int y = _random.Next(0, 95); + + for(int x = 0; x < 99; x++) + { + _map[x, y] = _barrier; + _map[x, y + 5] = _barrier; + + if (x % 5 == 0) + { + _map[x, y + 1] = _barrier; + _map[x, y + 2] = _barrier; + _map[x, y + 3] = _barrier; + _map[x, y + 4] = _barrier; + } + } + counter += 1; + } + } + } +}