diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs b/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs index 3197e1e..fd58948 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs @@ -166,7 +166,9 @@ 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(14, 16); this.comboBoxSelectorMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs b/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs index 41c0576..638b11e 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs @@ -95,6 +95,12 @@ namespace AirplaneWithRadar case "Простая карта": _abstractMap = new SimpleMap(); break; + case "Карта неба с облаками": + _abstractMap = new SkyMap(); + break; + case "Карта дождливого неба с грозой": + _abstractMap = new RainySkyMap(); + break; } } } diff --git a/AirplaneWithRadar/AirplaneWithRadar/RainySkyMap.cs b/AirplaneWithRadar/AirplaneWithRadar/RainySkyMap.cs new file mode 100644 index 0000000..a56eb30 --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/RainySkyMap.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirplaneWithRadar +{ + internal class RainySkyMap : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Brush barrierColor = new SolidBrush(Color.Blue); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.DarkGray); + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y); + //g.DrawLine(barrierColor, i * _size_x, j * _size_y, i * _size_x + _size_x, j * _size_y + (1 / 3) * _size_y); + //g.DrawLine(barrierColor, i * _size_x + _size_x, j * _size_y + (1 / 3) * _size_y, i * _size_x, j * _size_y + (2 * 3) * _size_y); + //g.DrawLine(barrierColor, i * _size_x, j * _size_y + 2 * _size_y, i * _size_x + _size_x, j * _size_y + 3 * _size_y); + } + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y); + } + protected override void GenerateMap() + { + _map = new int[100, 100]; + _size_x = (float)_width / _map.GetLength(0); + _size_y = (float)_height / _map.GetLength(1); + int counter = 0; + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + _map[i, j] = _freeRoad; + } + } + while (counter < 12) + { + int x = _random.Next(0, 100); + int y = _random.Next(0, 100); + if (_map[x, y] == _freeRoad) + { + if (y + 5 < 100 && x + 3 < 100) + { + _map[x, y] = _barrier; + _map[x + 1, y + 1] = _barrier; + _map[x + 2, y + 2] = _barrier; + _map[x + 1, y + 3] = _barrier; + _map[x + 2, y + 4] = _barrier; + _map[x + 3 , y + 5] = _barrier; + counter++; + } + } + } + } + } +} diff --git a/AirplaneWithRadar/AirplaneWithRadar/SkyMap.cs b/AirplaneWithRadar/AirplaneWithRadar/SkyMap.cs new file mode 100644 index 0000000..b09abf6 --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/SkyMap.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AirplaneWithRadar +{ + /// + /// Простая реализация абсрактного класса AbstractMap + /// + internal class SkyMap : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Brush barrierColor = new SolidBrush(Color.Gray); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.LightBlue); + + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillEllipse(barrierColor, i * (_size_x - 1), j * (_size_y - 1), 40, 24); + } + 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 < 15) + { + int x = _random.Next(0, 100); + int y = _random.Next(0, 100); + if (_map[x, y] == _freeRoad) + { + _map[x, y] = _barrier; + counter++; + } + } + } + } +}