Переход на конструкторы.

This commit is contained in:
Макс Бондаренко 2022-09-21 10:11:01 +04:00
parent 74cc61815c
commit d35b31c29c
3 changed files with 4 additions and 6 deletions

View File

@ -16,10 +16,9 @@ namespace WarmlyShip
private readonly int _warmlyShipWidth = 125; //Ширина отрисовки корабля private readonly int _warmlyShipWidth = 125; //Ширина отрисовки корабля
private readonly int _warmlyShipHeight = 50; //Высота отрисовки корабля private readonly int _warmlyShipHeight = 50; //Высота отрисовки корабля
public void Init(int speed, float weight, Color bodyColor) public DrawingWarmlyShip(int speed, float weight, Color bodyColor)
{ {
warmlyShip = new EntityWarmlyShip(); warmlyShip = new EntityWarmlyShip(speed, weight, bodyColor);
warmlyShip.Init(speed, weight, bodyColor);
} }
public void SetPosition(int x, int y, int width, int height) public void SetPosition(int x, int y, int width, int height)

View File

@ -13,7 +13,7 @@ namespace WarmlyShip
public Color BodyColor { get; private set; } //Цвет public Color BodyColor { get; private set; } //Цвет
public float Step => Speed * 100 / Weight; //Шаг при перемещении public float Step => Speed * 100 / Weight; //Шаг при перемещении
public void Init(int speed, float weight, Color bodyColor) public EntityWarmlyShip(int speed, float weight, Color bodyColor)
{ {
Random random = new Random(); Random random = new Random();
Speed = speed <= 0 ? random.Next(50, 150) : speed; Speed = speed <= 0 ? random.Next(50, 150) : speed;

View File

@ -20,8 +20,7 @@ namespace WarmlyShip
private void ButtonCreate_Click(object sender, EventArgs e) private void ButtonCreate_Click(object sender, EventArgs e)
{ {
Random random = new Random(); Random random = new Random();
_warmlyShip = new DrawingWarmlyShip(); _warmlyShip = new DrawingWarmlyShip(random.Next(100, 300), random.Next(1000, 3000), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)));
_warmlyShip.Init(random.Next(100, 300), random.Next(1000, 3000), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)));
_warmlyShip.SetPosition(random.Next(pictureBox.Width - 150, pictureBox.Width - 125), random.Next(pictureBox.Height - 150, pictureBox.Height - 50), pictureBox.Width, pictureBox.Height); _warmlyShip.SetPosition(random.Next(pictureBox.Width - 150, pictureBox.Width - 125), random.Next(pictureBox.Height - 150, pictureBox.Height - 50), pictureBox.Width, pictureBox.Height);
toolStripStatusSpeed.Text = $"Ñêîðîñòü: {_warmlyShip.warmlyShip?.Speed}"; toolStripStatusSpeed.Text = $"Ñêîðîñòü: {_warmlyShip.warmlyShip?.Speed}";
toolStripStatusWeight.Text = $"Âåñ: {_warmlyShip.warmlyShip?.Weight}"; toolStripStatusWeight.Text = $"Âåñ: {_warmlyShip.warmlyShip?.Weight}";