From 2ac8378669ebb61de0d391af57f8e490273efba9 Mon Sep 17 00:00:00 2001 From: Pavel_Sorokin Date: Tue, 27 Sep 2022 13:03:07 +0400 Subject: [PATCH 1/7] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4?= =?UTF-8?q?=20=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D1=80=D1=83?= =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80=D1=8B.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Liner/Liner/DrawingShip.cs | 5 ++--- Liner/Liner/EntityShip.cs | 2 +- Liner/Liner/FormShip.cs | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Liner/Liner/DrawingShip.cs b/Liner/Liner/DrawingShip.cs index 36c8ff3..2ce7dc1 100644 --- a/Liner/Liner/DrawingShip.cs +++ b/Liner/Liner/DrawingShip.cs @@ -15,10 +15,9 @@ namespace Liner private int? _pictureHeight = null; protected readonly int _ShipWidth = 120; protected readonly int _ShipHeight = 40; - public void Init(int speed, float weight, Color bodycolor) + public DrawingShip(int speed, float weight, Color bodycolor) { - Ship = new EntityShip(); - Ship.Init(speed, weight, bodycolor); + Ship = new EntityShip(speed, weight, bodycolor); } public void SetPosition(int x, int y, int width, int height) diff --git a/Liner/Liner/EntityShip.cs b/Liner/Liner/EntityShip.cs index 46613d6..7946fa5 100644 --- a/Liner/Liner/EntityShip.cs +++ b/Liner/Liner/EntityShip.cs @@ -16,7 +16,7 @@ namespace Liner public float Step => Speed * 100 / Weight; - public void Init(int speed, float weight, Color bodycolor) + public EntityShip(int speed, float weight, Color bodycolor) { Speed = speed; Weight = weight; diff --git a/Liner/Liner/FormShip.cs b/Liner/Liner/FormShip.cs index 4eb0604..68223cf 100644 --- a/Liner/Liner/FormShip.cs +++ b/Liner/Liner/FormShip.cs @@ -23,8 +23,7 @@ namespace Liner private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _ship = new DrawingShip(); - _ship.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + _ship = new DrawingShip(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); _ship.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxShip.Width, pictureBoxShip.Height); toolStripStatusLabelSpeed.Text = $": {_ship.Ship?.Speed}"; toolStripStatusLabelWeight.Text = $": {_ship.Ship?.Weight}"; -- 2.25.1 From 4b8abfe62b5b3a3ffd3b42138b4e0202b7b1bcd9 Mon Sep 17 00:00:00 2001 From: Pavel_Sorokin Date: Tue, 27 Sep 2022 13:22:48 +0400 Subject: [PATCH 2/7] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B4=D0=B2=D0=B8=D0=BD?= =?UTF-8?q?=D1=83=D1=82=D1=8B=D0=B9=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Liner/Liner/DrawingLiner.cs | 43 ++++++++++++++++++++++++++++++++ Liner/Liner/DrawingShip.cs | 27 +++++++++++--------- Liner/Liner/EntityLiner.cs | 25 +++++++++++++++++++ Liner/Liner/FormShip.Designer.cs | 13 ++++++++++ Liner/Liner/FormShip.cs | 23 +++++++++++++---- 5 files changed, 114 insertions(+), 17 deletions(-) create mode 100644 Liner/Liner/DrawingLiner.cs create mode 100644 Liner/Liner/EntityLiner.cs diff --git a/Liner/Liner/DrawingLiner.cs b/Liner/Liner/DrawingLiner.cs new file mode 100644 index 0000000..0d99201 --- /dev/null +++ b/Liner/Liner/DrawingLiner.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Liner +{ + internal class DrawningLiner : DrawingShip + { + public DrawningLiner(int speed, float weight, Color bodyColor, Color dopColor, bool dopDeck, bool pool) : + base(speed, weight, bodyColor, 130, 45) + { + Ship = new EntityLiner(speed, weight, bodyColor, dopColor, dopDeck, pool); + } + public override void DrawTransport(Graphics g) + { + if (Ship is not EntityLiner liner) + { + return; + } + Pen pen = new(Color.Black); + Brush dopbrush = new SolidBrush(liner.DopColor); + if (liner.DopDeck) + { + g.FillRectangle(dopbrush, (int)_startPosX + 50, (int)_startPosY + 15, 60, 5); + g.DrawRectangle(pen, (int)_startPosX+ 50, (int)_startPosY + 15, 60, 5); + } + _startPosX += 10; + _startPosY += 5; + base.DrawTransport(g); + _startPosY -= 5; + _startPosX -= 10; + if (liner.Pool) + { + g.FillRectangle(dopbrush, (int)_startPosX + 15, (int)_startPosY + 25, 30, 3); + g.DrawRectangle(pen, (int)_startPosX + 15, (int)_startPosY + 25, 30, 3); + g.DrawLine(pen, _startPosX + 45, _startPosY + 25, _startPosX + 45, _startPosY + 20); + g.DrawLine(pen, _startPosX + 45, _startPosY + 20, _startPosX + 35, _startPosY + 20); + } + } + } +} diff --git a/Liner/Liner/DrawingShip.cs b/Liner/Liner/DrawingShip.cs index 2ce7dc1..271321a 100644 --- a/Liner/Liner/DrawingShip.cs +++ b/Liner/Liner/DrawingShip.cs @@ -8,9 +8,9 @@ namespace Liner { internal class DrawingShip { - public EntityShip Ship { get; set; } - private float _startPosX; - private float _startPosY; + public EntityShip Ship { get; protected set; } + protected float _startPosX; + protected float _startPosY; private int? _pictureWidth = null; private int? _pictureHeight = null; protected readonly int _ShipWidth = 120; @@ -19,7 +19,12 @@ namespace Liner { Ship = new EntityShip(speed, weight, bodycolor); } - + protected DrawingShip(int speed, float weight, Color bodyColor, int shipWidth, int shipHeight) : + this(speed, weight, bodyColor) + { + _ShipWidth = shipWidth; + _ShipHeight = shipHeight; + } public void SetPosition(int x, int y, int width, int height) { if (width <= _ShipWidth + x || height <= _ShipHeight + y || x<0 || y<0) @@ -71,7 +76,7 @@ namespace Liner } } - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { if (_startPosX < 0 || _startPosY < 0 || !_pictureWidth.HasValue || !_pictureHeight.HasValue) { @@ -79,8 +84,8 @@ namespace Liner } Pen pen = new(Color.Black); Brush br = new SolidBrush(Ship?.BodyColor ?? Color.Black); - g.FillRectangle(br, _startPosX + 40, _startPosY, 30 * 2, 10 * 2); - g.DrawRectangle(pen, _startPosX + 40, _startPosY, 30 * 2, 10 * 2); + g.FillRectangle(br, _startPosX + 40, _startPosY + 15, 70, 5); + g.DrawRectangle(pen, _startPosX + 40, _startPosY + 15, 70, 5); Point[] pointsdown = { new Point((int)_startPosX, (int)_startPosY+20), new Point((int)_startPosX + 60 * 2, (int)_startPosY+20), @@ -90,12 +95,10 @@ namespace Liner }; g.FillPolygon(br, pointsdown); - g.DrawLine(pen, _startPosX, _startPosY+20, _startPosX + 60 * 2, _startPosY+20); - g.DrawLine(pen, _startPosX+100, _startPosY+20*2, _startPosX + 120, _startPosY + 10 * 2); - g.DrawLine(pen, _startPosX, _startPosY+20, _startPosX + 20, _startPosY + 40); + g.DrawLine(pen, _startPosX, _startPosY + 20, _startPosX + 60 * 2, _startPosY + 20); + g.DrawLine(pen, _startPosX + 100, _startPosY + 20 * 2, _startPosX + 120, _startPosY + 10 * 2); + g.DrawLine(pen, _startPosX, _startPosY + 20, _startPosX + 20, _startPosY + 40); g.DrawLine(pen, _startPosX + 20, _startPosY + 40, _startPosX + 100, _startPosY + 40); - - } public void ChangeBorders(int width, int height) diff --git a/Liner/Liner/EntityLiner.cs b/Liner/Liner/EntityLiner.cs new file mode 100644 index 0000000..66b1827 --- /dev/null +++ b/Liner/Liner/EntityLiner.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Liner +{ + internal class EntityLiner : EntityShip + { + public Color DopColor { get; private set; } + + public bool DopDeck { get; private set; } + + public bool Pool { get; private set; } + + public EntityLiner(int speed, float weight, Color bodyColor, Color dopColor, bool dopDeck, bool pool) : + base(speed, weight, bodyColor) + { + DopColor = dopColor; + DopDeck = dopDeck; + Pool = pool; + } + } +} diff --git a/Liner/Liner/FormShip.Designer.cs b/Liner/Liner/FormShip.Designer.cs index d1d72f9..cc49763 100644 --- a/Liner/Liner/FormShip.Designer.cs +++ b/Liner/Liner/FormShip.Designer.cs @@ -38,6 +38,7 @@ this.buttonUp = new System.Windows.Forms.Button(); this.buttonRight = new System.Windows.Forms.Button(); this.buttonLeft = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).BeginInit(); this.statusStrip.SuspendLayout(); this.SuspendLayout(); @@ -143,11 +144,22 @@ this.buttonLeft.UseVisualStyleBackColor = true; this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); // + // buttonCreateModif + // + this.buttonCreateModif.Location = new System.Drawing.Point(138, 373); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(118, 29); + this.buttonCreateModif.TabIndex = 7; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); + // // FormShip // 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.buttonCreateModif); this.Controls.Add(this.buttonLeft); this.Controls.Add(this.buttonRight); this.Controls.Add(this.buttonUp); @@ -177,5 +189,6 @@ private Button buttonUp; private Button buttonRight; private Button buttonLeft; + private Button buttonCreateModif; } } \ No newline at end of file diff --git a/Liner/Liner/FormShip.cs b/Liner/Liner/FormShip.cs index 68223cf..10f9e4d 100644 --- a/Liner/Liner/FormShip.cs +++ b/Liner/Liner/FormShip.cs @@ -19,15 +19,20 @@ namespace Liner pictureBoxShip.Image = bmp; } - + + private void SetData() + { + Random rnd = new(); + toolStripStatusLabelSpeed.Text = $": {_ship.Ship?.Speed}"; + toolStripStatusLabelWeight.Text = $": {_ship.Ship?.Weight}"; + toolStripStatusLabelColor.Text = $": {_ship.Ship?.BodyColor.Name}"; + _ship.SetPosition(rnd.Next(100, 500), rnd.Next(10, 100), pictureBoxShip.Width, pictureBoxShip.Height); + } private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); _ship = new DrawingShip(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); - _ship.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxShip.Width, pictureBoxShip.Height); - toolStripStatusLabelSpeed.Text = $": {_ship.Ship?.Speed}"; - toolStripStatusLabelWeight.Text = $": {_ship.Ship?.Weight}"; - toolStripStatusLabelColor.Text = $": {_ship.Ship?.BodyColor.Name}"; + SetData(); Draw(); } private void ButtonMove_Click(object sender, EventArgs e) @@ -57,5 +62,13 @@ namespace Liner _ship?.ChangeBorders(pictureBoxShip.Width, pictureBoxShip.Height); Draw(); } + + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + _ship = new DrawningLiner(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))); + SetData(); + Draw(); + } } } \ No newline at end of file -- 2.25.1 From af14f178dd2682264051bd3009b85723a307b8b2 Mon Sep 17 00:00:00 2001 From: Pavel_Sorokin Date: Tue, 27 Sep 2022 13:43:28 +0400 Subject: [PATCH 3/7] =?UTF-8?q?=D0=90=D0=B1=D1=81=D1=82=D1=80=D0=B0=D0=BA?= =?UTF-8?q?=D1=82=D0=BD=D1=8B=D0=B9=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Liner/Liner/AbstractMap.cs | 147 +++++++++++++++++++++ Liner/Liner/Direction.cs | 1 + Liner/Liner/DrawingObjectShip.cs | 39 ++++++ Liner/Liner/DrawingShip.cs | 4 + Liner/Liner/FormMap.Designer.cs | 212 +++++++++++++++++++++++++++++++ Liner/Liner/FormMap.cs | 114 +++++++++++++++++ Liner/Liner/FormMap.resx | 63 +++++++++ Liner/Liner/FormShip.Designer.cs | 1 + Liner/Liner/IDrawingObject.cs | 20 +++ Liner/Liner/Program.cs | 2 +- Liner/Liner/SimpleMap.cs | 48 +++++++ 11 files changed, 650 insertions(+), 1 deletion(-) create mode 100644 Liner/Liner/AbstractMap.cs create mode 100644 Liner/Liner/DrawingObjectShip.cs create mode 100644 Liner/Liner/FormMap.Designer.cs create mode 100644 Liner/Liner/FormMap.cs create mode 100644 Liner/Liner/FormMap.resx create mode 100644 Liner/Liner/IDrawingObject.cs create mode 100644 Liner/Liner/SimpleMap.cs diff --git a/Liner/Liner/AbstractMap.cs b/Liner/Liner/AbstractMap.cs new file mode 100644 index 0000000..94a906b --- /dev/null +++ b/Liner/Liner/AbstractMap.cs @@ -0,0 +1,147 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Liner +{ + internal abstract class AbstractMap + { + private IDrawingObject _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, IDrawingObject drawningObject) + { + _width = width; + _height = height; + _drawningObject = drawningObject; + GenerateMap(); + while (!SetObjectOnMap()) + { + GenerateMap(); + } + return DrawMapWithObject(); + } + public bool CheckAround(float Left, float Right, float Top, float Bottom) + { + int startX = (int)(Left / _size_x); + int startY = (int)(Right / _size_y); + int endX = (int)(Top / _size_x); + int endY = (int)(Bottom / _size_y); + + for (int i = startX; i <= endX; i++) + { + for (int j = startY; j <= endY; j++) + { + if (_map[i, j] == _barrier) + { + return true; + } + } + } + return false; + } + public Bitmap MoveObject(Direction direction) + { + _drawningObject.MoveObject(direction); + (float Left, float Right, float Top, float Bottom) = _drawningObject.GetCurrentPosition(); + + if (CheckAround(Left, Right, Top, Bottom)) + { + _drawningObject.MoveObject(MoveObjectBack(direction)); + } + return DrawMapWithObject(); + + } + private Direction MoveObjectBack(Direction direction) + { + switch (direction) + { + case Direction.Up: + return Direction.Down; + case Direction.Down: + return Direction.Up; + case Direction.Left: + return Direction.Right; + case Direction.Right: + return Direction.Left; + } + return Direction.None; + } + 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); + (float Left, float Right, float Top, float Bottom) = _drawningObject.GetCurrentPosition(); + if (!CheckAround(Left, Right, Top, Bottom)) return true; + float startX = Left; + float startY = Right; + float lengthX = Top - Left; + float lengthY = Bottom - Right; + while (CheckAround(startX, startY, startX + lengthX, startY + lengthY)) + { + bool result; + do + { + result = CheckAround(startX, startY, startX + lengthX, startY + lengthY); + if (!result) + { + _drawningObject.SetObject((int)startX, (int)startY, _width, _height); + return true; + } + else + { + startX += _size_x; + } + } while (result); + startX = x; + startY += _size_y; + } + return false; + + + } + 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/Liner/Liner/Direction.cs b/Liner/Liner/Direction.cs index 38ba4ba..95a7a8d 100644 --- a/Liner/Liner/Direction.cs +++ b/Liner/Liner/Direction.cs @@ -8,6 +8,7 @@ namespace Liner { internal enum Direction { + None=0, Up = 1, Down = 2, Left = 3, diff --git a/Liner/Liner/DrawingObjectShip.cs b/Liner/Liner/DrawingObjectShip.cs new file mode 100644 index 0000000..39ade25 --- /dev/null +++ b/Liner/Liner/DrawingObjectShip.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Liner +{ + internal class DrawingObjectShip : IDrawingObject + { + private DrawingShip _ship = null; + + public DrawingObjectShip(DrawingShip ship) + { + _ship = ship; + } + public float Step => _ship?.Ship.Step ?? 0; + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return _ship?.GetCurrentPosition() ?? default; + } + public void MoveObject(Direction direction) + { + _ship?.MoveTransport(direction); + } + + public void SetObject(int x, int y, int width, int height) + { + _ship.SetPosition(x, y, width, height); + } + + + void IDrawingObject.DrawningObject(Graphics g) + { + _ship.DrawTransport(g); + } + + } +} diff --git a/Liner/Liner/DrawingShip.cs b/Liner/Liner/DrawingShip.cs index 271321a..7c3b324 100644 --- a/Liner/Liner/DrawingShip.cs +++ b/Liner/Liner/DrawingShip.cs @@ -121,5 +121,9 @@ namespace Liner } } + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return (_startPosX, _startPosY, _startPosX + _ShipWidth, _startPosY + _ShipHeight); + } } } diff --git a/Liner/Liner/FormMap.Designer.cs b/Liner/Liner/FormMap.Designer.cs new file mode 100644 index 0000000..5962354 --- /dev/null +++ b/Liner/Liner/FormMap.Designer.cs @@ -0,0 +1,212 @@ +namespace Liner +{ + 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.pictureBoxShip = new System.Windows.Forms.PictureBox(); + this.statusStrip = 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.buttonCreate = new System.Windows.Forms.Button(); + this.buttonLeft = new System.Windows.Forms.Button(); + this.buttonUp = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonRight = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); + this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).BeginInit(); + this.statusStrip.SuspendLayout(); + this.SuspendLayout(); + // + // pictureBoxShip + // + this.pictureBoxShip.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBoxShip.Location = new System.Drawing.Point(0, 0); + this.pictureBoxShip.Name = "pictureBoxShip"; + this.pictureBoxShip.Size = new System.Drawing.Size(800, 424); + this.pictureBoxShip.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBoxShip.TabIndex = 0; + this.pictureBoxShip.TabStop = false; + // + // statusStrip + // + this.statusStrip.ImageScalingSize = new System.Drawing.Size(20, 20); + this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabelBodyColor}); + this.statusStrip.Location = new System.Drawing.Point(0, 424); + this.statusStrip.Name = "statusStrip"; + this.statusStrip.Size = new System.Drawing.Size(800, 26); + this.statusStrip.TabIndex = 1; + this.statusStrip.Text = "statusStrip1"; + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(76, 20); + this.toolStripStatusLabelSpeed.Text = "Скорость:"; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(36, 20); + this.toolStripStatusLabelWeight.Text = "Вес:"; + // + // toolStripStatusLabelBodyColor + // + this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(45, 20); + this.toolStripStatusLabelBodyColor.Text = "Цвет:"; + // + // 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(12, 392); + this.buttonCreate.Name = "buttonCreate"; + this.buttonCreate.Size = new System.Drawing.Size(94, 29); + this.buttonCreate.TabIndex = 2; + this.buttonCreate.Text = "Создать"; + this.buttonCreate.UseVisualStyleBackColor = true; + this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click); + // + // buttonLeft + // + this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonLeft.BackgroundImage = global::Liner.Properties.Resources._1; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(686, 391); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(30, 30); + this.buttonLeft.TabIndex = 3; + this.buttonLeft.UseVisualStyleBackColor = true; + this.buttonLeft.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.BackgroundImage = global::Liner.Properties.Resources._4; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(722, 355); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(30, 30); + this.buttonUp.TabIndex = 4; + this.buttonUp.UseVisualStyleBackColor = true; + this.buttonUp.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.BackgroundImage = global::Liner.Properties.Resources._2; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(722, 391); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(30, 30); + this.buttonDown.TabIndex = 5; + this.buttonDown.UseVisualStyleBackColor = true; + this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonRight + // + this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRight.BackgroundImage = global::Liner.Properties.Resources._3; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(758, 391); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(30, 30); + this.buttonRight.TabIndex = 6; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.Click += new System.EventHandler(this.ButtonMove_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(112, 391); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(121, 29); + this.buttonCreateModif.TabIndex = 7; + 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(12, 12); + this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; + this.comboBoxSelectorMap.Size = new System.Drawing.Size(151, 28); + this.comboBoxSelectorMap.TabIndex = 8; + this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged_1); + // + // 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.comboBoxSelectorMap); + this.Controls.Add(this.buttonCreateModif); + this.Controls.Add(this.buttonRight); + this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonUp); + this.Controls.Add(this.buttonLeft); + this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.pictureBoxShip); + this.Controls.Add(this.statusStrip); + this.Name = "FormMap"; + this.Text = "Form1"; + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).EndInit(); + this.statusStrip.ResumeLayout(false); + this.statusStrip.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private PictureBox pictureBoxShip; + private StatusStrip statusStrip; + private ToolStripStatusLabel toolStripStatusLabelSpeed; + private ToolStripStatusLabel toolStripStatusLabelWeight; + private ToolStripStatusLabel toolStripStatusLabelBodyColor; + private Button buttonCreate; + private Button buttonUp; + private Button buttonLeft; + private Button buttonRight; + private Button buttonDown; + private Button buttonCreateModif; + private ComboBox comboBoxSelectorMap; + + } +} \ No newline at end of file diff --git a/Liner/Liner/FormMap.cs b/Liner/Liner/FormMap.cs new file mode 100644 index 0000000..d015036 --- /dev/null +++ b/Liner/Liner/FormMap.cs @@ -0,0 +1,114 @@ +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 Liner +{ + public partial class FormMap : Form + { + private AbstractMap _abstractMap; + public FormMap() + { + InitializeComponent(); + _abstractMap = new SimpleMap(); + } + private void SetData(DrawingShip ship) + { + Random rnd = new(); + toolStripStatusLabelSpeed.Text = $"Скорость: {ship.Ship.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {ship.Ship.Weight}"; + toolStripStatusLabelBodyColor.Text = $"Цвет: {ship.Ship.BodyColor.Name}"; + if (comboBoxSelectorMap.Text == "Простая карта") + { + pictureBoxShip.Image = _abstractMap.CreateMap(pictureBoxShip.Width, pictureBoxShip.Height, new DrawingObjectShip(ship)); + new DrawingObjectShip(ship); + } + if (comboBoxSelectorMap.Text == "Море и айсберги") + { + pictureBoxShip.Image = _abstractMap.CreateMap(pictureBoxShip.Width, pictureBoxShip.Height, new DrawingObjectShip(ship)); + new DrawingObjectShip(ship); + } + if (comboBoxSelectorMap.Text == "Болото") + { + pictureBoxShip.Image = _abstractMap.CreateMap(pictureBoxShip.Width, pictureBoxShip.Height, new DrawingObjectShip(ship)); + new DrawingObjectShip(ship); + } + + + + } + + + + private void ButtonCreate_Click(object sender, EventArgs e) + { + Random rnd = new(); + var ship = new DrawingShip(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + SetData(ship); + + } + 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; + } + if (comboBoxSelectorMap.Text == "Простая карта") + { + pictureBoxShip.Image = _abstractMap?.MoveObject(dir); + } + if (comboBoxSelectorMap.Text == "Море и айсберги") + { + pictureBoxShip.Image = _abstractMap?.MoveObject(dir); + } + if (comboBoxSelectorMap.Text == "Болото") + { + pictureBoxShip.Image = _abstractMap?.MoveObject(dir); + } + + } + + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + var ship = new DrawningLiner(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))); + SetData(ship); + + } + + + + private void ComboBoxSelectorMap_SelectedIndexChanged_1(object sender, EventArgs e) + { + switch (comboBoxSelectorMap.Text) + { + case "Простая карта": + _abstractMap = new SimpleMap(); + break; + + } + } + + + } +} diff --git a/Liner/Liner/FormMap.resx b/Liner/Liner/FormMap.resx new file mode 100644 index 0000000..2c0949d --- /dev/null +++ b/Liner/Liner/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/Liner/Liner/FormShip.Designer.cs b/Liner/Liner/FormShip.Designer.cs index cc49763..341b36c 100644 --- a/Liner/Liner/FormShip.Designer.cs +++ b/Liner/Liner/FormShip.Designer.cs @@ -146,6 +146,7 @@ // // 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(138, 373); this.buttonCreateModif.Name = "buttonCreateModif"; this.buttonCreateModif.Size = new System.Drawing.Size(118, 29); diff --git a/Liner/Liner/IDrawingObject.cs b/Liner/Liner/IDrawingObject.cs new file mode 100644 index 0000000..d849ded --- /dev/null +++ b/Liner/Liner/IDrawingObject.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Liner +{ + internal interface IDrawingObject + { + public float Step { get; } + 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(); + } +} diff --git a/Liner/Liner/Program.cs b/Liner/Liner/Program.cs index 4cb7185..d04dba2 100644 --- a/Liner/Liner/Program.cs +++ b/Liner/Liner/Program.cs @@ -11,7 +11,7 @@ namespace Liner // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormShip()); + Application.Run(new FormMap()); } } } \ No newline at end of file diff --git a/Liner/Liner/SimpleMap.cs b/Liner/Liner/SimpleMap.cs new file mode 100644 index 0000000..cec355f --- /dev/null +++ b/Liner/Liner/SimpleMap.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Liner +{ + 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++; + } + } + } + } +} -- 2.25.1 From 59677e8cdaf907cebc048a666e16e2cafce6c980 Mon Sep 17 00:00:00 2001 From: Pavel_Sorokin Date: Tue, 27 Sep 2022 13:48:45 +0400 Subject: [PATCH 4/7] =?UTF-8?q?=D0=94=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB?= =?UTF-8?q?=20=D0=BE=D1=81=D1=82=D0=B0=D0=B2=D1=88=D0=B8=D0=B5=D1=81=D1=8F?= =?UTF-8?q?=202=20=D0=BA=D0=B0=D1=80=D1=82=D1=8B(SeaMap,SwampMap).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Liner/Liner/FormMap.cs | 8 ++++++- Liner/Liner/SeaMap.cs | 52 +++++++++++++++++++++++++++++++++++++++++ Liner/Liner/SwampMap.cs | 51 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 Liner/Liner/SeaMap.cs create mode 100644 Liner/Liner/SwampMap.cs diff --git a/Liner/Liner/FormMap.cs b/Liner/Liner/FormMap.cs index d015036..53e5bfd 100644 --- a/Liner/Liner/FormMap.cs +++ b/Liner/Liner/FormMap.cs @@ -105,7 +105,13 @@ namespace Liner case "Простая карта": _abstractMap = new SimpleMap(); break; - + case "Море и айсберги": + _abstractMap = new SeaMap(); + break; + case "Болото": + _abstractMap = new SwampMap(); + break; + } } diff --git a/Liner/Liner/SeaMap.cs b/Liner/Liner/SeaMap.cs new file mode 100644 index 0000000..43b2616 --- /dev/null +++ b/Liner/Liner/SeaMap.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Liner +{ + internal class SeaMap : AbstractMap + { + private readonly Brush barrierColor = new SolidBrush(Color.White); + + 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, i * (_size_x + 1), j * (_size_y + 1)); + 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 < 25) + { + int x = _random.Next(0, 97); + int y = _random.Next(0, 97); + if (_map[x, y] == _freeRoad) + { + _map[x, y + 1] = _barrier; + _map[x + 1, y + 1] = _barrier; + _map[x + 2, y + 1] = _barrier; + _map[x + 1, y] = _barrier; + counter++; + } + } + } + } +} diff --git a/Liner/Liner/SwampMap.cs b/Liner/Liner/SwampMap.cs new file mode 100644 index 0000000..6d19977 --- /dev/null +++ b/Liner/Liner/SwampMap.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Liner +{ + internal class SwampMap : AbstractMap + { + private readonly Brush barrierColor = new SolidBrush(Color.DarkGreen); + + private readonly Brush roadColor = new SolidBrush(Color.AliceBlue); + + 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)); + 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 < 25) + { + int x = _random.Next(0, 97); + int y = _random.Next(0, 97); + if (_map[x, y] == _freeRoad) + { + _map[x, y] = _barrier; + _map[x + 2, y] = _barrier; + _map[x, y + 2] = _barrier; + counter++; + } + } + } + } +} -- 2.25.1 From 22d0a11c11f5f30bacfd8159ebbe62756a2bd71a Mon Sep 17 00:00:00 2001 From: Pavel_Sorokin Date: Tue, 27 Sep 2022 16:05:45 +0400 Subject: [PATCH 5/7] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D1=84=D0=BE=D1=80=D0=BC=D1=8B(FormMap)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Liner/Liner/AbstractMap.cs | 4 ++++ Liner/Liner/FormMap.Designer.cs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Liner/Liner/AbstractMap.cs b/Liner/Liner/AbstractMap.cs index 94a906b..942fb3e 100644 --- a/Liner/Liner/AbstractMap.cs +++ b/Liner/Liner/AbstractMap.cs @@ -109,6 +109,10 @@ namespace Liner } while (result); startX = x; startY += _size_y; + if (startY > 100) + { + break; + } } return false; diff --git a/Liner/Liner/FormMap.Designer.cs b/Liner/Liner/FormMap.Designer.cs index 5962354..4e97c18 100644 --- a/Liner/Liner/FormMap.Designer.cs +++ b/Liner/Liner/FormMap.Designer.cs @@ -184,7 +184,7 @@ this.Controls.Add(this.pictureBoxShip); this.Controls.Add(this.statusStrip); this.Name = "FormMap"; - this.Text = "Form1"; + this.Text = "Карта"; ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).EndInit(); this.statusStrip.ResumeLayout(false); this.statusStrip.PerformLayout(); -- 2.25.1 From b661207897f0331adbf9488feb98202286816929 Mon Sep 17 00:00:00 2001 From: Pavel_Sorokin Date: Tue, 27 Sep 2022 16:06:58 +0400 Subject: [PATCH 6/7] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BB=D0=B8=D1=88=D0=BD=D1=8F=D1=8F=20=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D1=87=D0=BA=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Liner/Liner/AbstractMap.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Liner/Liner/AbstractMap.cs b/Liner/Liner/AbstractMap.cs index 942fb3e..94a906b 100644 --- a/Liner/Liner/AbstractMap.cs +++ b/Liner/Liner/AbstractMap.cs @@ -109,10 +109,6 @@ namespace Liner } while (result); startX = x; startY += _size_y; - if (startY > 100) - { - break; - } } return false; -- 2.25.1 From eb6e8d6ccee8995128caa527f2464bc89bd4cb08 Mon Sep 17 00:00:00 2001 From: Pavel_Sorokin Date: Fri, 30 Sep 2022 09:34:58 +0400 Subject: [PATCH 7/7] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=D1=8B=20?= =?UTF-8?q?=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D1=87=D0=BA=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Liner/Liner/FormMap.cs | 35 +++-------------------------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/Liner/Liner/FormMap.cs b/Liner/Liner/FormMap.cs index 53e5bfd..4315453 100644 --- a/Liner/Liner/FormMap.cs +++ b/Liner/Liner/FormMap.cs @@ -24,24 +24,8 @@ namespace Liner toolStripStatusLabelSpeed.Text = $"Скорость: {ship.Ship.Speed}"; toolStripStatusLabelWeight.Text = $"Вес: {ship.Ship.Weight}"; toolStripStatusLabelBodyColor.Text = $"Цвет: {ship.Ship.BodyColor.Name}"; - if (comboBoxSelectorMap.Text == "Простая карта") - { - pictureBoxShip.Image = _abstractMap.CreateMap(pictureBoxShip.Width, pictureBoxShip.Height, new DrawingObjectShip(ship)); - new DrawingObjectShip(ship); - } - if (comboBoxSelectorMap.Text == "Море и айсберги") - { - pictureBoxShip.Image = _abstractMap.CreateMap(pictureBoxShip.Width, pictureBoxShip.Height, new DrawingObjectShip(ship)); - new DrawingObjectShip(ship); - } - if (comboBoxSelectorMap.Text == "Болото") - { - pictureBoxShip.Image = _abstractMap.CreateMap(pictureBoxShip.Width, pictureBoxShip.Height, new DrawingObjectShip(ship)); - new DrawingObjectShip(ship); - } - - - + pictureBoxShip.Image = _abstractMap.CreateMap(pictureBoxShip.Width, pictureBoxShip.Height, new DrawingObjectShip(ship)); + new DrawingObjectShip(ship); } @@ -55,7 +39,6 @@ namespace Liner } private void ButtonMove_Click(object sender, EventArgs e) { - //получаем имя кнопки string name = ((Button)sender)?.Name ?? string.Empty; Direction dir = Direction.None; switch (name) @@ -73,19 +56,7 @@ namespace Liner dir = Direction.Right; break; } - if (comboBoxSelectorMap.Text == "Простая карта") - { - pictureBoxShip.Image = _abstractMap?.MoveObject(dir); - } - if (comboBoxSelectorMap.Text == "Море и айсберги") - { - pictureBoxShip.Image = _abstractMap?.MoveObject(dir); - } - if (comboBoxSelectorMap.Text == "Болото") - { - pictureBoxShip.Image = _abstractMap?.MoveObject(dir); - } - + pictureBoxShip.Image = _abstractMap?.MoveObject(dir); } private void ButtonCreateModif_Click(object sender, EventArgs e) -- 2.25.1