From b699fe055309f7d236546ee714c1bbf18921fb16 Mon Sep 17 00:00:00 2001 From: just1valery Date: Tue, 27 Sep 2022 10:49:18 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D1=80=D1=83=D0=BA?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs | 5 ++--- WarmlyShip/WarmlyShip/EntityWarmlyShip.cs | 2 +- WarmlyShip/WarmlyShip/FormShip.cs | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs b/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs index 29e8eb8..b467f6d 100644 --- a/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs +++ b/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs @@ -36,10 +36,9 @@ /// Скорость /// Вес коробля /// Цвет основной части - public void Init(int speed, float weight, Color bodyColor) + public DrawningWarmlyShip(int speed, float weight, Color bodyColor) { - Ship = new EntityWarmlyShip(); - Ship.Init(speed, weight, bodyColor); + Ship = new EntityWarmlyShip(speed, weight, bodyColor); } /// /// Установка позиции коробля diff --git a/WarmlyShip/WarmlyShip/EntityWarmlyShip.cs b/WarmlyShip/WarmlyShip/EntityWarmlyShip.cs index 236dd56..1e364f4 100644 --- a/WarmlyShip/WarmlyShip/EntityWarmlyShip.cs +++ b/WarmlyShip/WarmlyShip/EntityWarmlyShip.cs @@ -31,7 +31,7 @@ namespace WarmlyShip /// /// /// - public void Init(int speed, float weight, Color bodyColor) + public EntityWarmlyShip(int speed, float weight, Color bodyColor) { Random rnd = new(); Speed = speed <= 0 ? rnd.Next(50, 150) : speed; diff --git a/WarmlyShip/WarmlyShip/FormShip.cs b/WarmlyShip/WarmlyShip/FormShip.cs index 14b3681..d4eb684 100644 --- a/WarmlyShip/WarmlyShip/FormShip.cs +++ b/WarmlyShip/WarmlyShip/FormShip.cs @@ -22,8 +22,7 @@ namespace WarmlyShip private void buttonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _ship = new DrawningWarmlyShip(); - _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 DrawningWarmlyShip(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}";