Merge branch 'develop' into dhain

# Conflicts:
#	ProjectSettings/RiderScriptEditorPersistedState.asset

Assets/Scripts/DayController.cs

@@ -7,7 +7,9 @@ using UnityEngine.Events;
 public class DayController : MonoBehaviour {
     private int dayCount = 0;
     private static UnityEvent newDayEvent;
-    
+    public static UnityEvent NewDayEvent => newDayEvent;
+
+
     private void OnMouseDown() {
         newDay();
     }

Assets/Scripts/PlayerController.cs

@@ -0,0 +1,38 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PlayerController : MonoBehaviour {
+    private List<Item> inventory;
+    private int money;
+    private UsableItem selectedItem;
+    
+    private static PlayerController instance;
+    
+    public int startMoney = 100;
+
+    public static PlayerController getInstance() {
+        return instance;
+    }
+    
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        inventory ??= new List<Item>();
+        money = startMoney;
+        instance = this;
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    public void setSelectedItem(UsableItem item) {
+        selectedItem = item;
+        
+        
+    }
+}

Assets/Scripts/UsableItem.cs

@@ -0,0 +1,25 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class UsableItem : Item, IUsable
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    public UsableItem(string displayName, string description, int id) : base(displayName, description, id) {
+    }
+
+    public void select() {
+        throw new System.NotImplementedException();
+    }
+}

ProjectSettings/RiderScriptEditorPersistedState.asset

@@ -1,15 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &1
-MonoBehaviour:
-  m_ObjectHideFlags: 61
-  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: 0}
-  m_Name: 
-  m_EditorClassIdentifier: Unity.Rider.Editor:Packages.Rider.Editor:RiderScriptEditorPersistedState
-  lastWriteTicks: -8585494757829068137