From 33aeb63548b9c9099ae38669ae02d0d7d9caa706 Mon Sep 17 00:00:00 2001
From: Marselchi <sagirovmm@gmail.com>
Date: Mon, 25 Sep 2023 09:52:56 +0400
Subject: [PATCH 1/2] =?UTF-8?q?=D0=92=D0=BE=D1=81=D1=81=D1=82=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B5=D1=80=D1=8F=D0=BD=D0=BD=D1=8B=D1=85=20=D1=84=D0=B0=D0=B9?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Liner/Liner.csproj | 26 ++++++++++++++++++++++++++
 Liner/Liner.sln    | 25 +++++++++++++++++++++++++
 Liner/Program.cs   | 17 +++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 Liner/Liner.csproj
 create mode 100644 Liner/Liner.sln
 create mode 100644 Liner/Program.cs

diff --git a/Liner/Liner.csproj b/Liner/Liner.csproj
new file mode 100644
index 0000000..13ee123
--- /dev/null
+++ b/Liner/Liner.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/Liner/Liner.sln b/Liner/Liner.sln
new file mode 100644
index 0000000..44bab19
--- /dev/null
+++ b/Liner/Liner.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.6.33815.320
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Liner", "Liner.csproj", "{3EF53D4D-3ED6-42CC-A624-222DCB3C5114}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3EF53D4D-3ED6-42CC-A624-222DCB3C5114}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3EF53D4D-3ED6-42CC-A624-222DCB3C5114}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3EF53D4D-3ED6-42CC-A624-222DCB3C5114}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3EF53D4D-3ED6-42CC-A624-222DCB3C5114}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {B3D86E6B-CC33-4EF3-A79E-2BF6171C6AF9}
+	EndGlobalSection
+EndGlobal
diff --git a/Liner/Program.cs b/Liner/Program.cs
new file mode 100644
index 0000000..8976e9d
--- /dev/null
+++ b/Liner/Program.cs
@@ -0,0 +1,17 @@
+namespace Liner
+{
+    internal static class Program
+    {
+        /// <summary>
+        ///  The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main()
+        {
+            // To customize application configuration such as set high DPI settings or default font,
+            // see https://aka.ms/applicationconfiguration.
+            ApplicationConfiguration.Initialize();
+            Application.Run(new MainScreen());
+        }
+    }
+}
\ No newline at end of file

From 6745fe7894cf2f0477a4f9a6c4363c02e461909b Mon Sep 17 00:00:00 2001
From: Marselchi <sagirovmm@gmail.com>
Date: Mon, 25 Sep 2023 10:33:42 +0400
Subject: [PATCH 2/2] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B0=D1=8F=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Liner/EntityLiner.cs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/Liner/EntityLiner.cs b/Liner/EntityLiner.cs
index 36da029..f2859df 100644
--- a/Liner/EntityLiner.cs
+++ b/Liner/EntityLiner.cs
@@ -22,24 +22,19 @@ namespace Liner
         /// </summary>
         public Color BodyColor { get; private set; }
         /// <summary>
-        /// Основной цвет
+        /// Доп цвет
         /// </summary>
- 
         public Color BottomColor { get; private set; }
         /// <summary>
-        /// Цвет палубы
-        /// </summary>
-        public bool SwimmingPool { get; private set; }
-        /// <summary>
         /// Признак (опция) наличия бассейна
         /// </summary>
-        public bool Deck { get; private set; }
+        public bool SwimmingPool { get; private set; }
         /// <summary>
         /// Признак (опция) наличия доп палубы
         /// </summary>
-        public bool SportLine { get; private set; }
+        public bool Deck { get; private set; }
         /// <summary>
-        /// Шаг перемещения лайнера
+        /// Шаг
         /// </summary>
         public double Step => (double)Speed * 100 / Weight;
         /// <summary>
@@ -48,7 +43,7 @@ namespace Liner
         /// <param name="speed">Скорость</param>
         /// <param name="weight">Вес лайнера</param>
         /// <param name="bodyColor">Основной цвет</param>
-        /// <param name="bodyColor">Цвет палубы</param>
+        /// <param name="bottomColor">Цвет палубы</param>
         /// <param name="swimmingPool">Признак наличия бассейна</param>
         /// <param name="deck">Признак наличия доп палубы</param>
         public void Init(int speed, double weight, Color bodyColor, Color bottomColor, bool swimmingPool, bool deck)