From 2c774e7f3978ebdaa2708e20727e0f732316f76c Mon Sep 17 00:00:00 2001
From: Cat-pranks <Cat-pranks@DESKTOP-NTNPL1E>
Date: Mon, 12 Feb 2024 18:48:11 +0800
Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=BA=D0=BE=D0=BD=D1=87=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D1=83=20=D0=B2=20SetPos?=
 =?UTF-8?q?ition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AccordionBus/DrawningAccordionBus.cs      | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/AccordionBus/AccordionBus/DrawningAccordionBus.cs b/AccordionBus/AccordionBus/DrawningAccordionBus.cs
index 88949bd..882b58f 100644
--- a/AccordionBus/AccordionBus/DrawningAccordionBus.cs
+++ b/AccordionBus/AccordionBus/DrawningAccordionBus.cs
@@ -81,56 +81,44 @@ public class DrawningAccordionBus
     public void SetPosition(int x, int y)
     {
         if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
-        {
             return;
-        }
-        if (x > 0 && y > 0 && x+_drawningAccordionBusWidth < _pictureWidth && y+_drawningAccordionBusHeight < _pictureHeight)
+        if (x > 0 && y > 0 && x + _drawningAccordionBusWidth < _pictureWidth && y + _drawningAccordionBusHeight < _pictureHeight)
         {
             _startPosX = x;
             _startPosY = y;
         }
         else
         {
-            _startPosX = _pictureWidth.Value-_drawningAccordionBusWidth;
-            _startPosY = _pictureHeight.Value-_drawningAccordionBusHeight;
+            Random rnd = new Random();
+            _startPosX = rnd.Next(0, _pictureWidth.Value - _drawningAccordionBusWidth);
+            _startPosY = rnd.Next(0, _pictureHeight.Value - _drawningAccordionBusHeight);
         }
     }
     public bool MoveTransport(DirectionType direction)
     {
-        if (EntityAccordionBus == null || !_startPosX.HasValue ||
-        !_startPosY.HasValue)
-        {
+        if (EntityAccordionBus == null || !_startPosX.HasValue || !_startPosY.HasValue)
             return false;
-        }
         switch (direction)
         {
             //влево
             case DirectionType.Left:
                 if (_startPosX.Value - EntityAccordionBus.Step > 0)
-                {
                     _startPosX -= (int)EntityAccordionBus.Step;
-                }
                 return true;
             //вверх
             case DirectionType.Up:
                 if (_startPosY.Value - EntityAccordionBus.Step > 0)
-                {
                     _startPosY -= (int)EntityAccordionBus.Step;
-                }
                 return true;
             // вправо
             case DirectionType.Right:
                 if(_startPosX.Value + _drawningAccordionBusWidth < _pictureWidth)
-                {
                     _startPosX += (int)EntityAccordionBus.Step;
-                }
                 return true;
             //вниз
             case DirectionType.Down:
                 if (_startPosY.Value + _drawningAccordionBusHeight < _pictureHeight)
-                {
                     _startPosY += (int)EntityAccordionBus.Step;
-                }
                 return true;
             default:
                 return false;
@@ -144,9 +132,7 @@ public class DrawningAccordionBus
     {
         if (EntityAccordionBus == null || !_startPosX.HasValue ||
         !_startPosY.HasValue)
-        {
             return;
-        }
         //кузов
         Brush br = new SolidBrush(EntityAccordionBus.BodyColor);
         g.FillRectangle(br,_startPosX.Value, _startPosY.Value, 100, 30);