From fe63511825694b08ceeb8d732d79790b66d21a3b Mon Sep 17 00:00:00 2001
From: s-prechtl <sprechtl@htl-steyr.ac.at>
Date: Fri, 3 Jun 2022 08:29:07 +0200
Subject: [PATCH] Fishing Rod + Cursor

---
 Assets/Items/Usable/FishingRod.asset      | 20 ++++++++++++++++++++
 Assets/Items/Usable/FishingRod.asset.meta |  3 +++
 Assets/Scripts/TileBehaviour.cs           |  2 +-
 Assets/Scripts/Tiles/BaseTile.cs          |  6 +++---
 Packages/packages-lock.json               | 13 ++-----------
 5 files changed, 29 insertions(+), 15 deletions(-)
 create mode 100644 Assets/Items/Usable/FishingRod.asset
 create mode 100644 Assets/Items/Usable/FishingRod.asset.meta

diff --git a/Assets/Items/Usable/FishingRod.asset b/Assets/Items/Usable/FishingRod.asset
new file mode 100644
index 0000000..996a94d
--- /dev/null
+++ b/Assets/Items/Usable/FishingRod.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: 761f645f009328845bc7851753024e92, type: 3}
+  m_Name: FishingRod
+  m_EditorClassIdentifier: 
+  displayName: Fishing Rod
+  description: Used to fish fish.
+  id: 5
+  selectedSprite: {fileID: 21300214, guid: 2700e06d970d112489ff23cfb58c3f78, type: 3}
+  defaultSprite: {fileID: 21300240, guid: 2700e06d970d112489ff23cfb58c3f78, type: 3}
+  cost: 100
diff --git a/Assets/Items/Usable/FishingRod.asset.meta b/Assets/Items/Usable/FishingRod.asset.meta
new file mode 100644
index 0000000..b0c09a0
--- /dev/null
+++ b/Assets/Items/Usable/FishingRod.asset.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ea1a26b19bc34a0ba29bad77253c7266
+timeCreated: 1654237403
\ No newline at end of file
diff --git a/Assets/Scripts/TileBehaviour.cs b/Assets/Scripts/TileBehaviour.cs
index 2dd38d5..bf8da11 100644
--- a/Assets/Scripts/TileBehaviour.cs
+++ b/Assets/Scripts/TileBehaviour.cs
@@ -4,7 +4,7 @@ using UnityEngine;
 public class TileBehaviour : MonoBehaviour
 {
     private BaseTile _tile;
-    
+
     // Start is called before the first frame update
     void Start()
     {
diff --git a/Assets/Scripts/Tiles/BaseTile.cs b/Assets/Scripts/Tiles/BaseTile.cs
index 5ffa2f5..9d3c834 100644
--- a/Assets/Scripts/Tiles/BaseTile.cs
+++ b/Assets/Scripts/Tiles/BaseTile.cs
@@ -7,11 +7,11 @@ namespace Tiles
         protected Color color;
         public Color getColor => color;
         // TODO: Change to Sprite, also in subclasses
-        // public Sprite sprite;
+         public Sprite Sprite;
         
-        protected BaseTile(Color color)
+        protected BaseTile(Sprite sprite)
         {
-            this.color = color;
+            this.Sprite = sprite;
         }
 
         protected void Start()
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"
     },