Вторая лабораторная работа

WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs

@@ -20,7 +20,7 @@ namespace WarmlyShip
                 return;
             }
 
-            Pen pen = new(Color.Black);
+            Pen pen = new(Color.Black, 2);
             Brush dopBrush = new SolidBrush(warmlyShip.DopColor);
 
             base.DrawTransport(g);

WarmlyShip/WarmlyShip/FormMap.Designer.cs

@@ -157,11 +157,14 @@
             this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBoxSelectorMap.FormattingEnabled = true;
             this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта"});
+            "Простая карта",
+            "Карта океана с островами",
+            "Карта речки c камнями"});
             this.comboBoxSelectorMap.Location = new System.Drawing.Point(12, 12);
             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
             // 

WarmlyShip/WarmlyShip/FormMap.cs

@@ -94,6 +94,12 @@ namespace WarmlyShip
                 case "Простая карта":
                     _abstractMap = new SimpleMap();
                     break;
+                case "Карта океана с островами":
+                    _abstractMap = new OceanMap();
+                    break;
+                case "Карта речки c камнями":
+                    _abstractMap = new RiverMap();
+                    break;
             }
         }
     }

WarmlyShip/WarmlyShip/OceanMap.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+    /// <summary>
+    /// Простая реализация абсрактного класса AbstractMap
+    /// </summary>
+    internal class OceanMap : AbstractMap
+    {
+        /// <summary>
+        /// Цвет участка закрытого
+        /// </summary>
+        private readonly Brush barrierColor = new SolidBrush(Color.DarkGray);
+        /// <summary>
+        /// Цвет участка открытого
+        /// </summary>
+        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 < 7)
+            {
+                int x = _random.Next(0, 100);
+                int y = _random.Next(0, 100);
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    }
+}

WarmlyShip/WarmlyShip/RiverMap.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+    internal class RiverMap : AbstractMap
+    {
+        /// <summary>
+        /// Цвет участка закрытого
+        /// </summary>
+        private readonly Brush barrierColor = new SolidBrush(Color.Gray);
+        /// <summary>
+        /// Цвет участка открытого
+        /// </summary>
+        private readonly Brush roadColor = new SolidBrush(Color.Blue);
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _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 < 30)
+            {
+                int x = _random.Next(0, 100);
+                int y = _random.Next(0, 100);
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    }
+}