diff --git a/Assets/Items/Hoe.asset b/Assets/Items/Hoe.asset deleted file mode 100644 index de0b895..0000000 --- a/Assets/Items/Hoe.asset +++ /dev/null @@ -1,19 +0,0 @@ -%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: Hoe - m_EditorClassIdentifier: - displayName: - description: - id: 0 - selectedSprite: {fileID: 21300238, guid: 2700e06d970d112489ff23cfb58c3f78, type: 3} - defaultSprite: {fileID: 21300212, guid: 2700e06d970d112489ff23cfb58c3f78, type: 3} diff --git a/Assets/Items/Hoe.asset.meta b/Assets/Items/Hoe.asset.meta deleted file mode 100644 index c88d91e..0000000 --- a/Assets/Items/Hoe.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 55fbb48b3a41c1049af9b40f3fd35db1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Items/Scythe.asset b/Assets/Items/Scythe.asset deleted file mode 100644 index d62929e..0000000 --- a/Assets/Items/Scythe.asset +++ /dev/null @@ -1,20 +0,0 @@ -%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: Scythe - m_EditorClassIdentifier: - displayName: Scythe - description: sus - id: 0 - spriteRenderer: {fileID: 0} - defaultSprite: {fileID: 21300208, guid: 2700e06d970d112489ff23cfb58c3f78, type: 3} - selectedSprite: {fileID: 21300234, guid: 2700e06d970d112489ff23cfb58c3f78, type: 3} diff --git a/Assets/Items/Scythe.asset.meta b/Assets/Items/Scythe.asset.meta deleted file mode 100644 index e09ae6d..0000000 --- a/Assets/Items/Scythe.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 03bae48711a435b4bb9c1892438a3b3a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Item.cs b/Assets/Scripts/Item.cs index 46327d7..e8c4e43 100644 --- a/Assets/Scripts/Item.cs +++ b/Assets/Scripts/Item.cs @@ -1,6 +1,7 @@ using System; using UnityEngine; +[CreateAssetMenu(fileName = "New Item", menuName = "Inventory/Item")] public class Item : ScriptableObject, IComparable { public string displayName; public string description; diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 12ee6ea..602cdf3 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -38,7 +38,7 @@ public class PlayerController : MonoBehaviour { public void SetSelectedItem(UsableItem item) { if(_inventory.items.ContainsKey(item)) { selectedItem = item; - Cursor.SetCursor(item.defaultSprite.texture, Vector2.zero, CursorMode.Auto); + Cursor.SetCursor(item.selectedSprite.texture, Vector2.zero, CursorMode.Auto); } else { Debug.Log("An item requested to select isn't in the inventory" + item); } diff --git a/Assets/Scripts/UsableItem.cs b/Assets/Scripts/UsableItem.cs index 5b9a0b2..9af8526 100644 --- a/Assets/Scripts/UsableItem.cs +++ b/Assets/Scripts/UsableItem.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +[CreateAssetMenu(fileName = "New UsableItem", menuName = "Inventory/UsableItem")] public class UsableItem : Item, IUsable { // Start is called before the first frame update void Start() {