From d4acf1cc781f7f87784b3f1839354ed2a0017638 Mon Sep 17 00:00:00 2001
From: BOTLester <58360400+BOTLester@users.noreply.github.com>
Date: Wed, 6 May 2020 22:47:56 +0200
Subject: [PATCH 1/5] Soil properites

---
 Game1/Sources/Crops/SoilProperties.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Game1/Sources/Crops/SoilProperties.cs b/Game1/Sources/Crops/SoilProperties.cs
index 2a6ee14..b7c534a 100644
--- a/Game1/Sources/Crops/SoilProperties.cs
+++ b/Game1/Sources/Crops/SoilProperties.cs
@@ -11,7 +11,7 @@ class SoilProperties
 
 
     public string soilType = "potato";
-    public float Temparature;
+    public float Temperature;
     public float Humidity;
     public float Moisture;
     public float Nitrogen;
@@ -20,12 +20,12 @@ class SoilProperties
 
     public void setSoilProperties()
     {
-        Temparature = GetRandomNumber(22, 30);
-        Humidity = GetRandomNumber(1, 5);
-        Moisture = GetRandomNumber(1, 10);
-        Nitrogen = GetRandomNumber(0.5 , 1);
-        Potassium = GetRandomNumber(5, 20);
-        Phosphorous = GetRandomNumber(4, 50);
+        Temperature = GetRandomNumber(22, 30);
+        Humidity = Temperature * GetRandomNumber(1.9, 2.1);
+        Moisture = GetRandomNumber(20, 70);
+        Nitrogen = GetRandomNumber(4 , 55);
+        Potassium = GetRandomNumber(0, 28);
+        Phosphorous = GetRandomNumber(0, 60);
     }
 
     public float GetRandomNumber(double minimum, double maximum)

From 2e9b78f1a04b5ed4299db4c882941bd68182e167 Mon Sep 17 00:00:00 2001
From: BOTLester <58360400+BOTLester@users.noreply.github.com>
Date: Wed, 6 May 2020 22:55:40 +0200
Subject: [PATCH 2/5] corrections

---
 Game1/Sources/Crops/Crops.cs          | 2 +-
 Game1/Sources/Crops/SoilProperties.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Game1/Sources/Crops/Crops.cs b/Game1/Sources/Crops/Crops.cs
index 6230d6e..9bd57a2 100644
--- a/Game1/Sources/Crops/Crops.cs
+++ b/Game1/Sources/Crops/Crops.cs
@@ -220,7 +220,7 @@ class Crops
         }
         spriteBatch.DrawString(Bold, "Soil Properties:", new Vector2(240, Size.Y * (tileSize + Spacing) + 122), Color.DarkRed);
         spriteBatch.DrawString(Bold, "Soil Type: " + soilProperties.soilType, new Vector2(240, Size.Y * (tileSize + Spacing) + 142), Color.DarkBlue);
-        spriteBatch.DrawString(Bold, "Temparature: " + soilProperties.Temparature, new Vector2(240, Size.Y * (tileSize + Spacing) + 162), Color.DarkBlue);
+        spriteBatch.DrawString(Bold, "Temparature: " + soilProperties.Temperature, new Vector2(240, Size.Y * (tileSize + Spacing) + 162), Color.DarkBlue);
         spriteBatch.DrawString(Bold, "Moisture: " + soilProperties.Moisture, new Vector2(240, Size.Y * (tileSize + Spacing) + 182), Color.DarkBlue);
         spriteBatch.DrawString(Bold, "Humidity: " + soilProperties.Humidity, new Vector2(240, Size.Y * (tileSize + Spacing) + 202), Color.DarkBlue);
         spriteBatch.DrawString(Bold, "Phosphorous: " + soilProperties.Phosphorous, new Vector2(240, Size.Y * (tileSize + Spacing) + 222), Color.DarkBlue);
diff --git a/Game1/Sources/Crops/SoilProperties.cs b/Game1/Sources/Crops/SoilProperties.cs
index 160481f..9cece09 100644
--- a/Game1/Sources/Crops/SoilProperties.cs
+++ b/Game1/Sources/Crops/SoilProperties.cs
@@ -41,8 +41,8 @@ class SoilProperties
         {
             soilType = "Clayey";
         }
-        Temparature = GetRandomNumber(22, 30);
-        Humidity = Temparature * 2 + GetRandomNumber(1.9, 2.2);
+        Temperature = GetRandomNumber(22, 30);
+        Humidity = Temperature * GetRandomNumber(1.9, 2.1);
         Moisture = GetRandomNumber(20, 70);
         Nitrogen = GetRandomNumber(4 , 55);
         Potassium = GetRandomNumber(0, 28);

From 7a35bb09fe236bebb5f2948f896b5366f2835c8d Mon Sep 17 00:00:00 2001
From: BOTLester <58360400+BOTLester@users.noreply.github.com>
Date: Thu, 7 May 2020 22:09:45 +0200
Subject: [PATCH 3/5] Target Selection

---
 Game1/Game1.csproj                       |  35 +++++++
 Game1/Sources/Crops/Crops.cs             |   5 +
 Game1/Sources/Pathing/A-Star/Astar.cs    |  21 +++-
 Game1/Sources/Pathing/PQEntry.cs         |  26 +++++
 Game1/Sources/Pathing/PriorityQueueC5.cs |  49 ++++++++++
 Game1/Sources/Smart/AI.cs                | 117 +++++++++++++++++++++--
 Game1/Sources/Smart/SmartTractor.cs      |   6 +-
 7 files changed, 245 insertions(+), 14 deletions(-)
 create mode 100644 Game1/Sources/Pathing/PQEntry.cs
 create mode 100644 Game1/Sources/Pathing/PriorityQueueC5.cs

diff --git a/Game1/Game1.csproj b/Game1/Game1.csproj
index 218552a..d01150d 100644
--- a/Game1/Game1.csproj
+++ b/Game1/Game1.csproj
@@ -17,6 +17,21 @@
     <TargetFrameworkProfile />
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <PlatformTarget>x64</PlatformTarget>
@@ -63,6 +78,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup>
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Game1.cs" />
     <Compile Include="Program.cs" />
@@ -86,6 +104,8 @@
     <Compile Include="Sources\Pathing\A-Star\PathSaver\Path.cs" />
     <Compile Include="Sources\Pathing\A-Star\PathSaver\PriorityQueue.cs" />
     <Compile Include="Sources\Controlls\Controller.cs" />
+    <Compile Include="Sources\Pathing\PQEntry.cs" />
+    <Compile Include="Sources\Pathing\PriorityQueueC5.cs" />
     <Compile Include="Sources\Smart\AI.cs" />
     <Compile Include="Sources\Smart\ScoreSystem.cs" />
     <Compile Include="Sources\Smart\SmartTractor.cs" />
@@ -118,6 +138,9 @@
     <None Include="app.manifest" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="C5">
+      <Version>2.5.3</Version>
+    </PackageReference>
     <PackageReference Include="LightGBM">
       <Version>2.3.1</Version>
     </PackageReference>
@@ -155,6 +178,18 @@
       <Version>4.11.0</Version>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </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/Crops/Crops.cs b/Game1/Sources/Crops/Crops.cs
index 9bd57a2..3c785b7 100644
--- a/Game1/Sources/Crops/Crops.cs
+++ b/Game1/Sources/Crops/Crops.cs
@@ -47,6 +47,11 @@ class Crops
         soilProperties.setSoilProperties();
     }
 
+    public SoilProperties getSoilProperties()
+    {
+        return soilProperties;
+    }
+
 
 
     // Changes the time required for the crops to be harvestable
diff --git a/Game1/Sources/Pathing/A-Star/Astar.cs b/Game1/Sources/Pathing/A-Star/Astar.cs
index bdb83d4..4d92e25 100644
--- a/Game1/Sources/Pathing/A-Star/Astar.cs
+++ b/Game1/Sources/Pathing/A-Star/Astar.cs
@@ -10,22 +10,31 @@ class Astar
 
     private Vector2 tractorPos;
     private Vector2 housePos;
-    private Crops[,] crops;
+    private static Crops[,] crops;
     private Vector2 Size;
     private PriorityQueue allPaths;
     private Vector2 targetPos;
     private int Rotation;
 
-    public void update(Crops[,] newCrops, Vector2 newSize, Vector2 newTractorPos, Vector2 newHousePos, Vector2 newtargetPos, int rotation)
+    public void update(Crops[,] newCrops, Vector2 newSize, Vector2 newTractorPos, Vector2 newHousePos, int rotation)
     {
         tractorPos = new Vector2((int)newTractorPos.X, (int)newTractorPos.Y);
         housePos = new Vector2((int)newHousePos.X, (int)newHousePos.Y);
-        targetPos = newtargetPos;
         crops = newCrops;
         Size = newSize;
         Rotation = rotation;
     }
 
+    public void update(Crops[,] newCrops, Vector2 newSize, Vector2 newTractorPos, Vector2 newHousePos, Vector2 newTargetPos, int rotation)
+    {
+        tractorPos = new Vector2((int)newTractorPos.X, (int)newTractorPos.Y);
+        housePos = new Vector2((int)newHousePos.X, (int)newHousePos.Y);
+        crops = newCrops;
+        Size = newSize;
+        Rotation = rotation;
+        targetPos = newTargetPos;
+    }
+
     public Nodes getOptimalPath()
     {
         return allPaths.Peek();
@@ -92,7 +101,7 @@ class Astar
     }
 
     // Main function of A* algorithm
-    public Path FindPath()
+    public Path FindPath(bool flipArray)
     {
         int g = 0;
         int direction = ConvertRotation();
@@ -149,7 +158,9 @@ class Astar
             path.AddNode(current);
             current = current.getParent();
         }
-        path = path.FlipArray();
+
+        if (flipArray)
+            path = path.FlipArray();
 
         openList.deleteHeap();
         closedList.deleteHeap();
diff --git a/Game1/Sources/Pathing/PQEntry.cs b/Game1/Sources/Pathing/PQEntry.cs
new file mode 100644
index 0000000..39aee21
--- /dev/null
+++ b/Game1/Sources/Pathing/PQEntry.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Xna.Framework;
+
+
+public class PQEntry : IComparable<PQEntry>
+{
+    public int Key { get; set; }
+    public Vector2 Coordinates { get; set;  }
+
+    public int CompareTo(PQEntry other)
+    {
+        if (this.Key < other.Key)
+            return -1;
+        else if (this.Key > other.Key)
+            return 1;
+        else
+            return 0;
+    }
+
+}
+
+
diff --git a/Game1/Sources/Pathing/PriorityQueueC5.cs b/Game1/Sources/Pathing/PriorityQueueC5.cs
new file mode 100644
index 0000000..c318a73
--- /dev/null
+++ b/Game1/Sources/Pathing/PriorityQueueC5.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Xna.Framework;
+using C5;
+
+
+class PriorityQueueC5
+{
+
+    private readonly Astar astar = new Astar();
+    private IPriorityQueue<PQEntry> queue = new IntervalHeap<PQEntry>();
+
+    public void AddToQueue(List<PQEntry> nodes)
+    {
+        foreach (PQEntry item in nodes)
+        {
+            PQEntry temp = new PQEntry
+            {
+                Key = item.Key,
+                Coordinates = item.Coordinates
+            };
+            queue.Add(temp);
+        }
+    }
+
+    public void AddToQueue(int x, int y, int score)
+    {
+        PQEntry temp = new PQEntry
+        {
+            Key = score,
+            Coordinates = new Vector2(x, y)
+        };
+        queue.Add(temp);
+    }
+
+    public PQEntry DeleteMax()
+    {
+        return queue.DeleteMax();
+    }
+
+    public void AddAll(List<PQEntry> entryList)
+    {
+        queue.AddAll(entryList);
+    }
+
+}
\ No newline at end of file
diff --git a/Game1/Sources/Smart/AI.cs b/Game1/Sources/Smart/AI.cs
index 38410a7..fb4a3df 100644
--- a/Game1/Sources/Smart/AI.cs
+++ b/Game1/Sources/Smart/AI.cs
@@ -9,7 +9,6 @@ using Microsoft.Xna.Framework.Graphics;
 
 class AI
 {
-
     private Vector2 tractorPos;
     private Vector2 housePos;
     private Farm farm;
@@ -17,9 +16,8 @@ class AI
     private Vector2 targetPos;
     private Inventory inventory = new Inventory();
     private int Rotation;
-
-
-
+    private PriorityQueueC5 PriorityQueueC5;
+    private Astar astar = new Astar();
 
     private Random r = new Random();
 
@@ -40,8 +38,6 @@ class AI
     }
 
 
-
-
     public void update(Farm newFarm, Vector2 newSize, Vector2 newTractorPos, Vector2 newHousePos, Vector2 newtargetPos, int rotation)
     {
         tractorPos = new Vector2((int)newTractorPos.X, (int)newTractorPos.Y);
@@ -50,6 +46,7 @@ class AI
         farm = newFarm;
         Size = newSize;
         Rotation = rotation;
+        astar.update(farm.getCrops(), Size, tractorPos, housePos, rotation);
     }
 
 
@@ -61,7 +58,28 @@ class AI
 
     public Vector2 newTarget()
     {
-        return new Vector2(r.Next(0, (int)Size.X), r.Next(0, (int)Size.Y));
+        PriorityQueueC5 queue = new PriorityQueueC5();
+        int score = 0;
+        Vector2 newTarget;
+        for (int x = 0; x < Size.X; x++)
+            for (int y = 0; y < Size.Y; y++)
+            {
+                if (farm.getCrop(x, y).getStatus() >= 2 && tractorPos != new Vector2(x, y))
+                {
+                    if (farm.getCrop(x, y).getStatus() == 4 && farm.getCrop(x, y).getCropTimer() != 1)
+                    {
+                        //do nothing
+                    }
+                    else
+                    {
+                        score = calculateSoilScore(x, y);
+                        queue.AddToQueue(x, y, score);
+                    }
+                }
+            }
+
+        newTarget = GetMinFNode(5, queue);
+        return newTarget;
     }
 
     public Farm changeCropStatus()
@@ -77,4 +95,89 @@ class AI
     {
         return inventory;
     }
+
+    private int calculateSoilScore(int x, int y)
+    {
+        int score = 0;
+        int statusScore = 0;
+        int aproxDistance = (int)(Math.Abs(x - tractorPos.X) + Math.Abs(y - tractorPos.Y));
+        CropTypesHolder holder = new CropTypesHolder();
+        holder.init();
+
+        Crops crop = farm.getCrop(x, y);
+        SoilProperties soilP = crop.getSoilProperties();
+        int cropType = crop.getCropType();
+        CropTypes avgHold = holder.getPresetCropTypes(cropType);
+
+        if (crop.getStatus() == 2)
+            statusScore = 25;
+        else if (crop.getStatus() == 3)
+            statusScore = 5;
+        else if (crop.getStatus() == 4)
+            statusScore = -10;
+        else
+            statusScore = 1;
+
+        float[] currentValue = { soilP.Temperature, soilP.Humidity, soilP.Moisture, soilP.Nitrogen, soilP.Potassium, soilP.Phosphorous };
+        float[] targetAvg = { avgHold.Temparature, avgHold.Humidity, avgHold.Moisture, avgHold.Nitrogen, avgHold.Potassium, avgHold.Phosphorous };
+        float[,] minMax = { {22,30}, {22*1.9f, 30*2.1f}, {20, 70}, {4, 55}, {0, 28}, {0, 60} };         //probably should make it dynamic
+        float[] normVal = normArray(minMax, currentValue);
+        float[] normAvg = normArray(minMax, targetAvg);
+
+        for (int i = 0; i < normVal.Count(); i++)
+        {
+            score = score + (int)Math.Round(System.Convert.ToDouble(10*(1 - Math.Abs(normAvg[i] - normVal[i]))));
+        }
+
+        return score + (-aproxDistance * 3) + statusScore;
+    }
+
+    private float[] normArray(float[,] minMax, float[] values)
+    {
+        float[] temp = new float[values.Count()];
+        if (minMax.GetLength(0) != values.Count())
+            throw new InvalidOperationException("Values and their MinMax arrays are not of the same length!");
+
+        for (int i = 0; i < values.Count(); i++)
+            temp[i] = norm(minMax[i, 0], minMax[i, 1], values[i]);
+
+        return temp;
+    }
+
+    private float norm(float min, float max, float val)
+    {
+        return ((val - min) / (max - min));
+    }
+
+    public Vector2 GetMinFNode(int testSize, PriorityQueueC5 queue)
+    {
+        int index = 0;
+        int min = 999;
+        Path path = new Path();
+        List<PQEntry> entryList = new List<PQEntry>();
+        for (int i = 0; i < testSize; i++)
+        {
+            entryList.Add(queue.DeleteMax());
+        }
+
+        for (int i = 0; i < testSize; i++)
+        {
+            Nodes temp = new Nodes(entryList[i].Coordinates);
+            path = astar.FindPath(false);
+            Nodes tempF = new Nodes(path.getByIndex(0));
+            if (min > tempF.getF())
+            {
+                min = tempF.getF();
+                index = i;
+            }
+        }
+        PQEntry minEntry = entryList[index];
+        entryList.RemoveAt(index);
+
+        //add the non-minimum entries back to the queue.
+        queue.AddAll(entryList);
+
+        return minEntry.Coordinates;
+    }
+
 }
diff --git a/Game1/Sources/Smart/SmartTractor.cs b/Game1/Sources/Smart/SmartTractor.cs
index 74f5dae..8922878 100644
--- a/Game1/Sources/Smart/SmartTractor.cs
+++ b/Game1/Sources/Smart/SmartTractor.cs
@@ -18,10 +18,12 @@ class SmartTractor
     {
         ai.update(farm, Size, tractorPos / (tileSize + Spacing), housePos / (tileSize + Spacing), Target / (tileSize + Spacing), Rotation);
         farm = ai.changeCropStatus();
+        astar.update(farm.getCrops(), Size, tractorPos / (tileSize + Spacing), housePos / (tileSize + Spacing), Rotation);
         getTargetPosition(ai.newTarget());
-        astar.update(farm.getCrops(), Size, tractorPos / (tileSize + Spacing), housePos / (tileSize + Spacing), Target/(tileSize+Spacing), Rotation);
+        astar.update(farm.getCrops(), Size, tractorPos / (tileSize + Spacing), housePos / (tileSize + Spacing), Target / (tileSize + Spacing), Rotation);
 
-        return astar.FindPath();
+
+        return astar.FindPath(true);
     }
 
 

From e1b4dec7649ea89c897e11a11207c303080bdc99 Mon Sep 17 00:00:00 2001
From: BOTLester <58360400+BOTLester@users.noreply.github.com>
Date: Fri, 8 May 2020 00:35:53 +0200
Subject: [PATCH 4/5] Damn it works

---
 Game1/Sources/Pathing/A-Star/Astar.cs |  2 +-
 Game1/Sources/Smart/AI.cs             | 50 ++++++++++++++++++++-------
 Game1/Sources/Smart/SmartTractor.cs   |  1 -
 3 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/Game1/Sources/Pathing/A-Star/Astar.cs b/Game1/Sources/Pathing/A-Star/Astar.cs
index 4d92e25..f84c936 100644
--- a/Game1/Sources/Pathing/A-Star/Astar.cs
+++ b/Game1/Sources/Pathing/A-Star/Astar.cs
@@ -41,7 +41,7 @@ class Astar
     }
 
     // Get all adjacent nodes
-    private List<Nodes> GetAdjacentNodes(Vector2 currentPos)
+    public List<Nodes> GetAdjacentNodes(Vector2 currentPos)
     {
         var adjacentNodes = new List<Nodes>()
 
diff --git a/Game1/Sources/Smart/AI.cs b/Game1/Sources/Smart/AI.cs
index f6b9051..a168f10 100644
--- a/Game1/Sources/Smart/AI.cs
+++ b/Game1/Sources/Smart/AI.cs
@@ -59,25 +59,49 @@ class AI
     {
         PriorityQueueC5 queue = new PriorityQueueC5();
         int score = 0;
+        int count = 0;
+        int testsize = 2;
         Vector2 newTarget;
-        for (int x = 0; x < Size.X; x++)
-            for (int y = 0; y < Size.Y; y++)
-            {
-                if (farm.getCrop(x, y).getStatus() >= 2 && tractorPos != new Vector2(x, y))
+        while (true)
+        {
+            for (int x = 0; x < Size.X; x++)
+                for (int y = 0; y < Size.Y; y++)
                 {
-                    if (farm.getCrop(x, y).getStatus() == 4 && farm.getCrop(x, y).getCropTimer() != 1)
+                    if (farm.getCrop(x, y).getStatus() >= 2 && tractorPos != new Vector2(x, y))
                     {
-                        //do nothing
-                    }
-                    else
-                    {
-                        score = calculateSoilScore(x, y);
-                        queue.AddToQueue(x, y, score);
+                        if (farm.getCrop(x, y).getStatus() == 3 && farm.getCrop(x, y).getCropTimer() != 1)
+                        {
+                            if (housePos == tractorPos)
+                            {
+                                score = calculateSoilScore(x, y);
+                                queue.AddToQueue(x, y, score);
+                                count++;
+                            }
+                            //do nothing
+                        }
+                        else
+                        {
+                            score = calculateSoilScore(x, y);
+                            queue.AddToQueue(x, y, score);
+                            count++;
+                        }
                     }
                 }
-            }
+            if (count > 0)
+                break;
+            else if (tractorPos != housePos)
+                return housePos;
 
-        newTarget = GetMinFNode(5, queue);
+            /*
+            else if (tractorPos == housePos)
+            {
+                List<Nodes> temp = astar.GetAdjacentNodes(tractorPos);
+                return temp[0].getCords();
+            }
+            */
+        }
+
+        newTarget = GetMinFNode(Math.Min(testsize, count), queue);
         return newTarget;
     }
 
diff --git a/Game1/Sources/Smart/SmartTractor.cs b/Game1/Sources/Smart/SmartTractor.cs
index 6cdbfbc..29fdf50 100644
--- a/Game1/Sources/Smart/SmartTractor.cs
+++ b/Game1/Sources/Smart/SmartTractor.cs
@@ -23,7 +23,6 @@ class SmartTractor
         getTargetPosition(ai.newTarget());
         astar.update(farm.getCrops(), Size, tractorPos / (tileSize + Spacing), housePos / (tileSize + Spacing), Target / (tileSize + Spacing), Rotation);
 
-
         return astar.FindPath(true);
     }
 

From 4173b26d301295d44409ccec460a34e782bda8b6 Mon Sep 17 00:00:00 2001
From: Joel <joelstade99@hotmail.com>
Date: Sat, 9 May 2020 13:48:28 +0200
Subject: [PATCH 5/5] Inventory System added into ai

---
 Game1/Sources/Smart/AI.cs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/Game1/Sources/Smart/AI.cs b/Game1/Sources/Smart/AI.cs
index a168f10..19a58bf 100644
--- a/Game1/Sources/Smart/AI.cs
+++ b/Game1/Sources/Smart/AI.cs
@@ -25,15 +25,6 @@ class AI
     public void init()
     {
         inventory.initInventorySystem();
-        inventory.addItem(1, 1);
-        inventory.addItem(1, 1);
-        inventory.addItem(3, 1);
-        inventory.addItem(5, 1);
-        inventory.addItem(7, 1);
-        inventory.addItem(7, 1);
-        inventory.addItem(10, 1);
-        inventory.addItem(10, 1);       
-        inventory.useItem(10, 1);
     }
 
 
@@ -110,6 +101,11 @@ class AI
         if (farm.getCrop((int)tractorPos.X, (int)tractorPos.Y).getCropTimer() == 1)
         {
             farm.setCropStatus(tractorPos.X, tractorPos.Y);
+            if (farm.getCrop((int)tractorPos.X, (int)tractorPos.Y).getStatus() == 2)
+            {
+                inventory.addItem(farm.getCrop((int)tractorPos.X, (int)tractorPos.Y).getCropType() - 1, 1);
+            }
+            
         }
         return farm;
     }