From 1a9bcccfba2b26dd2d2351083e7eebb34a9675c8 Mon Sep 17 00:00:00 2001 From: Janis Meister Date: Thu, 23 Feb 2023 13:04:07 +0100 Subject: [PATCH] tools --- Assets/Items/Hoe.asset | 19 +++++++++++++++++++ Assets/Items/Hoe.asset.meta | 8 ++++++++ Assets/Scripts/Items.meta | 8 ++++++++ Assets/Scripts/{ => Items}/Crop.cs | 1 + Assets/Scripts/{ => Items}/Crop.cs.meta | 2 +- Assets/Scripts/Items/Hoe.cs | 15 +++++++++++++++ Assets/Scripts/Items/Hoe.cs.meta | 11 +++++++++++ Assets/Scripts/{ => Items}/Item.cs | 2 ++ Assets/Scripts/{ => Items}/Item.cs.meta | 2 +- Assets/Scripts/Items/Tool.cs | 14 ++++++++++++++ Assets/Scripts/Items/Tool.cs.meta | 11 +++++++++++ 11 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 Assets/Items/Hoe.asset create mode 100644 Assets/Items/Hoe.asset.meta create mode 100644 Assets/Scripts/Items.meta rename Assets/Scripts/{ => Items}/Crop.cs (99%) rename Assets/Scripts/{ => Items}/Crop.cs.meta (83%) create mode 100644 Assets/Scripts/Items/Hoe.cs create mode 100644 Assets/Scripts/Items/Hoe.cs.meta rename Assets/Scripts/{ => Items}/Item.cs (88%) rename Assets/Scripts/{ => Items}/Item.cs.meta (83%) create mode 100644 Assets/Scripts/Items/Tool.cs create mode 100644 Assets/Scripts/Items/Tool.cs.meta diff --git a/Assets/Items/Hoe.asset b/Assets/Items/Hoe.asset new file mode 100644 index 0000000..ccec6b0 --- /dev/null +++ b/Assets/Items/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: ab99e668aa1ba5a469eef680f3bb4b45, type: 3} + m_Name: Hoe + m_EditorClassIdentifier: + uuid: + itemName: + sprite: {fileID: 0} + stackable: 1 + maxStackSize: 100 diff --git a/Assets/Items/Hoe.asset.meta b/Assets/Items/Hoe.asset.meta new file mode 100644 index 0000000..40e18c6 --- /dev/null +++ b/Assets/Items/Hoe.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 030984201821ba840872812944c9dc13 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Items.meta b/Assets/Scripts/Items.meta new file mode 100644 index 0000000..51ffff6 --- /dev/null +++ b/Assets/Scripts/Items.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f02490ca5153f594898a0b93fcbd19e9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Crop.cs b/Assets/Scripts/Items/Crop.cs similarity index 99% rename from Assets/Scripts/Crop.cs rename to Assets/Scripts/Items/Crop.cs index 8830b3c..452f661 100644 --- a/Assets/Scripts/Crop.cs +++ b/Assets/Scripts/Items/Crop.cs @@ -2,6 +2,7 @@ using UnityEngine; using System; using System.Collections; using System.Collections.Generic; + [CreateAssetMenu(fileName = "Crop", menuName = "Harvestdale/Items/Crop", order = 0)] public class Crop : Item { diff --git a/Assets/Scripts/Crop.cs.meta b/Assets/Scripts/Items/Crop.cs.meta similarity index 83% rename from Assets/Scripts/Crop.cs.meta rename to Assets/Scripts/Items/Crop.cs.meta index 04341b4..281c20e 100644 --- a/Assets/Scripts/Crop.cs.meta +++ b/Assets/Scripts/Items/Crop.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e283aa008f05f1e46b99a7987202ec09 +guid: f00df81b4ec12f844a6f928d013437b2 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Items/Hoe.cs b/Assets/Scripts/Items/Hoe.cs new file mode 100644 index 0000000..25cc19a --- /dev/null +++ b/Assets/Scripts/Items/Hoe.cs @@ -0,0 +1,15 @@ +using UnityEngine; + +[CreateAssetMenu(fileName = "Hoe", menuName = "Harvestdale/Tools/Hoe", order = 0)] +public class Hoe : Tool +{ + public override void OnUse() + { + throw new System.NotImplementedException(); + } + + public override void Use() + { + OnUse(); + } +} \ No newline at end of file diff --git a/Assets/Scripts/Items/Hoe.cs.meta b/Assets/Scripts/Items/Hoe.cs.meta new file mode 100644 index 0000000..42cd96a --- /dev/null +++ b/Assets/Scripts/Items/Hoe.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ab99e668aa1ba5a469eef680f3bb4b45 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Item.cs b/Assets/Scripts/Items/Item.cs similarity index 88% rename from Assets/Scripts/Item.cs rename to Assets/Scripts/Items/Item.cs index 36adb84..9648e7e 100644 --- a/Assets/Scripts/Item.cs +++ b/Assets/Scripts/Items/Item.cs @@ -9,6 +9,8 @@ public class Item : ScriptableObject public string itemName; public Sprite sprite; + + [Tooltip("Tools will set this to false on Awake()")] public bool stackable = true; public int maxStackSize = 100; diff --git a/Assets/Scripts/Item.cs.meta b/Assets/Scripts/Items/Item.cs.meta similarity index 83% rename from Assets/Scripts/Item.cs.meta rename to Assets/Scripts/Items/Item.cs.meta index 55b2285..f6e1011 100644 --- a/Assets/Scripts/Item.cs.meta +++ b/Assets/Scripts/Items/Item.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 46a784de2d881964e8ee1583a44b5720 +guid: 00ac127aa1678874aa5c9f1381b6b47a MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Items/Tool.cs b/Assets/Scripts/Items/Tool.cs new file mode 100644 index 0000000..7f8d848 --- /dev/null +++ b/Assets/Scripts/Items/Tool.cs @@ -0,0 +1,14 @@ +using UnityEngine; + + +public abstract class Tool : Item +{ + public abstract void Use(); + public abstract void OnUse(); + + private void Awake() + { + stackable = false; + maxStackSize = 1; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Items/Tool.cs.meta b/Assets/Scripts/Items/Tool.cs.meta new file mode 100644 index 0000000..bee8a65 --- /dev/null +++ b/Assets/Scripts/Items/Tool.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 943c595a7de78d44eae1ff08651910a2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: