From 745ff2e590de69ed0b956925c83a689e34e7b366 Mon Sep 17 00:00:00 2001
From: BOTLester <58360400+BOTLester@users.noreply.github.com>
Date: Wed, 6 May 2020 20:48:20 +0200
Subject: [PATCH] hand merging cause its stupid

---
 Game1/Game1.cs                         | 14 +++---
 Game1/Game1.csproj                     | 41 ++++++++++++++++++
 Game1/Sources/Objects/DayNightCycle.cs | 60 ++++++++++++++++++++++----
 Game1/Sources/Objects/Tractor.cs       |  5 +++
 Game1/Sources/Smart/AI.cs              |  5 +++
 Game1/Sources/Smart/SmartTractor.cs    |  5 +++
 Game1/app.config                       | 29 ++++++++++++-
 7 files changed, 144 insertions(+), 15 deletions(-)

diff --git a/Game1/Game1.cs b/Game1/Game1.cs
index 41454a9..e028e85 100644
--- a/Game1/Game1.cs
+++ b/Game1/Game1.cs
@@ -160,9 +160,9 @@ namespace Game1
 
 
 
-            spriteBatch.Draw(house, houseUnit.GetRectangle(), Color.White);
+            spriteBatch.Draw(house, houseUnit.GetRectangle(), Time.GetTimeOfDay());
             spriteBatch.Draw(markers, new Rectangle((int)tractorUnit.getPath().getFinalDest().getCords().X * (input.getSpacingTile()) + Convert.ToInt32(input.getTileSize() / 6), (int)tractorUnit.getPath().getFinalDest().getCords().Y * (input.getSpacingTile()) + Convert.ToInt32(input.getTileSize() / 6), Convert.ToInt32(input.getTileSize() / 1.5), Convert.ToInt32(input.getTileSize() / 1.5)), Color.Red);                         //Draws the current target of the tractor
-            spriteBatch.Draw(tractor, new Vector2((int)tractorUnit.getPos().X + input.getTileSize() / 2, (int)tractorUnit.getPos().Y + input.getTileSize() / 2), new Rectangle(0, 0, input.getTileSize(), input.getTileSize()), Color.White, tractorUnit.getRotation(), new Vector2(input.getTileSize() / 2, input.getTileSize() / 2), 1.0f, SpriteEffects.None, 1);
+            spriteBatch.Draw(tractor, new Vector2((int)tractorUnit.getPos().X + input.getTileSize() / 2, (int)tractorUnit.getPos().Y + input.getTileSize() / 2), new Rectangle(0, 0, input.getTileSize(), input.getTileSize()), Time.GetTimeOfDay(), tractorUnit.getRotation(), new Vector2(input.getTileSize() / 2, input.getTileSize() / 2), 1.0f, SpriteEffects.None, 1);
 
 
 
@@ -176,8 +176,9 @@ namespace Game1
             }
 
             spriteBatch.DrawString(Bold, "Time: ", new Vector2(10, input.getSize().Y * (input.getTileSize() + input.getSpacing()) + 2), Color.DarkRed);
-            spriteBatch.DrawString(Bold, Time.getDayNight(), new Vector2(60, input.getSize().Y * (input.getTileSize() + input.getSpacing()) + 2), Color.DarkBlue);
-            spriteBatch.DrawString(Bold, Time.GetTimeOfDayInt().ToString(), new Vector2(10, input.getSize().Y * (input.getTileSize() + input.getSpacing()) + 22), Color.DarkBlue);
+            spriteBatch.DrawString(Bold, "Days " + Time.getDays(), new Vector2(60, input.getSize().Y * (input.getTileSize() + input.getSpacing()) + 2), Color.DarkBlue);
+            spriteBatch.DrawString(Bold, "Day Progression: ", new Vector2(10, input.getSize().Y * (input.getTileSize() + input.getSpacing()) + 22), Color.DarkRed);
+            spriteBatch.DrawString(Bold, Time.GetTimeOfDayInt().ToString() + "%", new Vector2(140, input.getSize().Y * (input.getTileSize() + input.getSpacing()) + 22), Color.DarkBlue);
 
             spriteBatch.DrawString(Bold, "Tractor Properties:", new Vector2(10, input.getSize().Y * (input.getTileSize() + input.getSpacing()) + 62), Color.DarkRed);
 
@@ -194,6 +195,9 @@ namespace Game1
             spriteBatch.DrawString(Bold, "Matrix Size: " + input.getSize().X.ToString() + " X " + input.getSize().Y.ToString(), new Vector2(10, input.getSize().Y * (input.getTileSize() + input.getSpacing()) + 242), Color.DarkBlue);
             spriteBatch.DrawString(Bold, "House Position: " + houseUnit.getVector() / input.getSpacingTile(), new Vector2(10, input.getSize().Y * (input.getTileSize() + input.getSpacing()) + 262), Color.DarkBlue);
 
+            spriteBatch.DrawString(Bold, "Total Weight: ", new Vector2(700, input.getSize().Y * (input.getTileSize() + input.getSpacing()) + 182), Color.DarkRed);
+            spriteBatch.DrawString(Bold, "(" + tractorUnit.getInventory().getWeight() + "/" + tractorUnit.getInventory().getMaxWeight() + ")", new Vector2(800, input.getSize().Y * (input.getTileSize() + input.getSpacing()) + 182), Color.DarkBlue);
+
             tractorUnit.drawInventory(input, spriteBatch, Bold, inventory.getPredefinedItems());
 
             InspectTile();
@@ -213,7 +217,7 @@ namespace Game1
                 for (int j = 0; j < input.getSize().Y; j++)
                 {
                     Rectangle tilePos = new Rectangle(i * (input.getSpacingTile()), j * (input.getSpacingTile()), input.getTileSize(), input.getTileSize());
-                    spriteBatch.Draw(tile[tractorUnit.getFarm().getCrop(i, j).getStatus()], tilePos, Color.White);
+                    spriteBatch.Draw(tile[tractorUnit.getFarm().getCrop(i, j).getStatus()], tilePos, Time.GetTimeOfDay());
                     if (tilePos.Intersects(mousePosition))
                     {
                         spriteBatch.Draw(tile[tractorUnit.getFarm().getCrop(i, j).getStatus()], tilePos, Color.FromNonPremultiplied(0, 0, 20, 40));
diff --git a/Game1/Game1.csproj b/Game1/Game1.csproj
index 264915a..ba120d6 100644
--- a/Game1/Game1.csproj
+++ b/Game1/Game1.csproj
@@ -15,6 +15,8 @@
     <MonoGamePlatform>Windows</MonoGamePlatform>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <PlatformTarget>x64</PlatformTarget>
@@ -92,6 +94,7 @@
       <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Windows\MonoGame.Framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Numerics" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -112,6 +115,44 @@
     <None Include="app.config" />
     <None Include="app.manifest" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="LightGBM">
+      <Version>2.3.1</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.ML">
+      <Version>1.4.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.ML.CpuMath">
+      <Version>1.4.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.ML.FastTree">
+      <Version>1.4.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.ML.LightGbm">
+      <Version>1.4.0</Version>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>12.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="System.CodeDom">
+      <Version>4.7.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Collections.Immutable">
+      <Version>1.7.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Memory">
+      <Version>4.5.4</Version>
+    </PackageReference>
+    <PackageReference Include="System.Reflection.Emit.Lightweight">
+      <Version>4.7.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
+      <Version>4.7.1</Version>
+    </PackageReference>
+    <PackageReference Include="System.Threading.Tasks.Dataflow">
+      <Version>4.11.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\MonoGame\v3.0\MonoGame.Content.Builder.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Game1/Sources/Objects/DayNightCycle.cs b/Game1/Sources/Objects/DayNightCycle.cs
index 60472ba..e111ea1 100644
--- a/Game1/Sources/Objects/DayNightCycle.cs
+++ b/Game1/Sources/Objects/DayNightCycle.cs
@@ -10,8 +10,9 @@ class DayNightCycle
     private bool Time = true;
     private int nightTime = 0;
     private int dayTime = 0;
-    private int lengthOfDay = 6000;
-    private int lengthOfNight = 6000;
+    private int lengthOfDay = 20000;
+    private int lengthOfNight = 20000;
+    private int Days;   
 
     public void updateTime(int Speed)
     {
@@ -33,6 +34,7 @@ class DayNightCycle
                 {
                     Time = true;
                     nightTime = 0;
+                    Days++;
                 }
             }
         }
@@ -52,28 +54,70 @@ class DayNightCycle
 
     public Color GetTimeOfDay()
     {
-        int blue;
-        if (nightTime == 0 || dayTime == 0)
+        int blue, red, brightness;
+        if (nightTime == 0 && dayTime == 0)
         {
+            red = 1;
             blue = 1;
+            brightness = 1;
+
         }
         else
         {
-            blue = (6000 / nightTime);
+            if ((float)dayTime / lengthOfDay < 0.5)
+            {
+                blue = (int)(((float)nightTime / lengthOfNight) * 255) + (int)((1.0f - (float)dayTime / lengthOfDay) * 255);
+            }
+            else
+            {
+                blue = (int)(((float)nightTime / lengthOfNight) * 255) + (int)(((float)dayTime / lengthOfDay) * 255);
+            }
+
+            if ((float)nightTime / lengthOfNight < 0.5)
+            {
+                red = (int)((1.0 - (float)nightTime / lengthOfNight) * 255) + (int)(((float)dayTime / lengthOfDay) * 255);
+            }
+            else
+            {
+                red = (int)(((float)nightTime / lengthOfNight) * 255) + (int)(((float)dayTime / lengthOfDay) * 255);
+            }
+
+            if (Time)
+            {
+                brightness = 255;
+            }
+            else
+            {
+                if ((float)nightTime / lengthOfNight < 0.5)
+                {
+                    brightness = (int)((1.0 - (float)nightTime / lengthOfNight) * 255) + (int)(((float)dayTime / lengthOfDay) * 255);
+                }
+                else
+                {
+                    brightness = (int)(((float)nightTime / lengthOfNight) * 255) + (int)(((float)dayTime / lengthOfDay) * 255);
+                }
+            }
         }
         
-        return Color.FromNonPremultiplied(0, 0, blue, 100);
+        return Color.FromNonPremultiplied(red, 255, blue, brightness);
     }
 
     public int GetTimeOfDayInt()
     {
         if (Time)
         {
-            return dayTime / 60;
+            return (int)(100 * ((float)(dayTime + nightTime) / (lengthOfDay + lengthOfNight))) + 1;
         }
         else
         {
-            return nightTime / 60;
+            return (int)(100 * ((float)(lengthOfDay + nightTime) / (lengthOfDay + lengthOfNight))) + 1;
         }
+        
+        
+    }
+
+    public int getDays()
+    {
+        return Days;
     }
 }
diff --git a/Game1/Sources/Objects/Tractor.cs b/Game1/Sources/Objects/Tractor.cs
index 8680b60..ba899ed 100644
--- a/Game1/Sources/Objects/Tractor.cs
+++ b/Game1/Sources/Objects/Tractor.cs
@@ -154,4 +154,9 @@ class Tractor
     {
         smartTractor.drawInventory(input, spriteBatch, Bold, itemStorageDefined);
     }
+
+    public Inventory getInventory()
+    {
+        return smartTractor.getInventory();
+    }
 }
diff --git a/Game1/Sources/Smart/AI.cs b/Game1/Sources/Smart/AI.cs
index 8c8e3a5..38410a7 100644
--- a/Game1/Sources/Smart/AI.cs
+++ b/Game1/Sources/Smart/AI.cs
@@ -72,4 +72,9 @@ class AI
         }
         return farm;
     }
+
+    public Inventory getInventory()
+    {
+        return inventory;
+    }
 }
diff --git a/Game1/Sources/Smart/SmartTractor.cs b/Game1/Sources/Smart/SmartTractor.cs
index ace6fa7..74f5dae 100644
--- a/Game1/Sources/Smart/SmartTractor.cs
+++ b/Game1/Sources/Smart/SmartTractor.cs
@@ -74,4 +74,9 @@ class SmartTractor
             farm.updateFarm(Size);
         }
     }
+
+    public Inventory getInventory()
+    {
+        return ai.getInventory();
+    }
 }
diff --git a/Game1/app.config b/Game1/app.config
index 3dbff35..1ff24a2 100644
--- a/Game1/app.config
+++ b/Game1/app.config
@@ -1,3 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.6.5.0" newVersion="4.6.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>