From 624432e1da5478f2da056c98d55ce89cd0c6cc93 Mon Sep 17 00:00:00 2001
From: j-weissen <jweissen@htl-steyr.ac.at>
Date: Wed, 8 Jun 2022 23:53:00 +0200
Subject: [PATCH] added Wheat item, changed Wheat Sprites

---
 Assets/Resources/Items/Wheat.asset      | 20 ++++++++++++++++++++
 Assets/Resources/Items/Wheat.asset.meta |  8 ++++++++
 Assets/Scripts/Crop.cs                  |  7 +++----
 Packages/packages-lock.json             | 13 ++-----------
 4 files changed, 33 insertions(+), 15 deletions(-)
 create mode 100644 Assets/Resources/Items/Wheat.asset
 create mode 100644 Assets/Resources/Items/Wheat.asset.meta

diff --git a/Assets/Resources/Items/Wheat.asset b/Assets/Resources/Items/Wheat.asset
new file mode 100644
index 0000000..56b0ba5
--- /dev/null
+++ b/Assets/Resources/Items/Wheat.asset
@@ -0,0 +1,20 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f096d187f76a734fac022700054dfec, type: 3}
+  m_Name: Wheat
+  m_EditorClassIdentifier: 
+  displayName: 
+  description: 
+  id: 0
+  selectedSprite: {fileID: 0}
+  defaultSprite: {fileID: 0}
+  price: 0
diff --git a/Assets/Resources/Items/Wheat.asset.meta b/Assets/Resources/Items/Wheat.asset.meta
new file mode 100644
index 0000000..bc75dff
--- /dev/null
+++ b/Assets/Resources/Items/Wheat.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 50258e55bb19a974985dfd97633286af
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Crop.cs b/Assets/Scripts/Crop.cs
index a789350..50290f3 100644
--- a/Assets/Scripts/Crop.cs
+++ b/Assets/Scripts/Crop.cs
@@ -38,9 +38,8 @@ public class Crop {
         _cropSpriteRenderer = cropSpriteRenderer;
         _hydrationSpriteRenderer = hydrationSpriteRenderer;
 
-        _smallCrop = BaseTile.GenerateSpriteFromFile("Assets/Farming Asset Pack/Split Assets/farming_tileset_027.png");
-        _fullyGrownCrop =
-            BaseTile.GenerateSpriteFromFile("Assets/Farming Asset Pack/Split Assets/farming_tileset_040.png");
+        _smallCrop = BaseTile.GenerateSpriteFromFile("Assets/Farming Asset Pack/Split Assets/farming_tileset_026.png");
+        _fullyGrownCrop = BaseTile.GenerateSpriteFromFile("Assets/Farming Asset Pack/Split Assets/farming_tileset_039.png");
 
         _hydratedColor = new Color(0.5f, 0.5f, 1.0f, 0.269420f);
 
@@ -112,7 +111,7 @@ public class Crop {
     }
 
     private void AddCropToInventory() {
-        Inventory.instance.AddItem(ItemContainer.Instance.GetItemByName("Wheat Seeds"), 3);
+        Inventory.instance.AddItem(ItemContainer.Instance.GetItemByName("Wheat"), 1);
     }
 
     private void UpdateSprite() {
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 40769bb..4f0557e 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -137,21 +137,12 @@
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
-    "com.unity.nuget.newtonsoft-json": {
-      "version": "3.0.2",
-      "depth": 2,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
     "com.unity.services.core": {
-      "version": "1.3.1",
+      "version": "1.0.1",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.nuget.newtonsoft-json": "3.0.2",
-        "com.unity.modules.androidjni": "1.0.0"
+        "com.unity.modules.unitywebrequest": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },