From db13c259208907ccf6b529ea030ac597292051f2 Mon Sep 17 00:00:00 2001 From: dhain Date: Fri, 20 May 2022 08:34:18 +0200 Subject: [PATCH] added Hoe & Scythe Items added starting Items in Inventory --- Assets/Items/Usable/Hoe.asset | 19 +++++++++++++++++++ Assets/Items/Usable/Scythe.asset | 19 +++++++++++++++++++ Assets/Scripts/Inventory.cs | 11 +++++------ 3 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 Assets/Items/Usable/Hoe.asset create mode 100644 Assets/Items/Usable/Scythe.asset diff --git a/Assets/Items/Usable/Hoe.asset b/Assets/Items/Usable/Hoe.asset new file mode 100644 index 0000000..d573fcc --- /dev/null +++ b/Assets/Items/Usable/Hoe.asset @@ -0,0 +1,19 @@ +%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: Hoe + m_EditorClassIdentifier: + displayName: Hoe + description: on the streets + id: 0 + selectedSprite: {fileID: 21300238, guid: 2700e06d970d112489ff23cfb58c3f78, type: 3} + defaultSprite: {fileID: 21300212, guid: 2700e06d970d112489ff23cfb58c3f78, type: 3} diff --git a/Assets/Items/Usable/Scythe.asset b/Assets/Items/Usable/Scythe.asset new file mode 100644 index 0000000..82b0d3d --- /dev/null +++ b/Assets/Items/Usable/Scythe.asset @@ -0,0 +1,19 @@ +%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: Scythe + m_EditorClassIdentifier: + displayName: Scythe + description: better than in stardew valley + id: 1 + selectedSprite: {fileID: 21300234, guid: 2700e06d970d112489ff23cfb58c3f78, type: 3} + defaultSprite: {fileID: 21300208, guid: 2700e06d970d112489ff23cfb58c3f78, type: 3} diff --git a/Assets/Scripts/Inventory.cs b/Assets/Scripts/Inventory.cs index 126196b..a74f566 100644 --- a/Assets/Scripts/Inventory.cs +++ b/Assets/Scripts/Inventory.cs @@ -19,6 +19,7 @@ public class Inventory : MonoBehaviour { #endregion public Dictionary items; + public Item[] startItems; public const int inventorySpace = 28; public delegate void onItemChanged(); @@ -26,13 +27,11 @@ public class Inventory : MonoBehaviour { private void Start() { items ??= new Dictionary(); + foreach(Item item in startItems) { + AddItem(item, 1); + } } - public void tempAddItem(Item item) { - Debug.Log("AWSD"); - AddItem(item, 1); - } - public void AddItem(Item item, int amount) { if(items.Count >= inventorySpace) { Debug.Log("Not enough inventory space!"); @@ -51,7 +50,7 @@ public class Inventory : MonoBehaviour { onItemChangedCallback?.Invoke(); } - public void removeItem(Item item, int amount) { + public void RemoveItem(Item item, int amount) { items.Add(item, -amount); onItemChangedCallback?.Invoke();