From 384ce05bb7bc60a93afe7af8594277724f2ec2fc Mon Sep 17 00:00:00 2001 From: dhain Date: Mon, 9 May 2022 23:39:29 +0200 Subject: [PATCH] base constructor for every Item --- Assets/Scripts/Item.cs | 4 ++-- Assets/Scripts/Items/FishingRod.cs | 8 +++++++- Assets/Scripts/Items/Hoe.cs | 3 ++- Assets/Scripts/Items/Scythe.cs | 3 ++- Assets/Scripts/Items/WateringCan.cs | 3 ++- Assets/Scripts/Items/Wheat.cs | 3 ++- Assets/Scripts/Items/WheatSeed.cs | 3 ++- ProjectSettings/RiderScriptEditorPersistedState.asset | 2 +- 8 files changed, 20 insertions(+), 9 deletions(-) diff --git a/Assets/Scripts/Item.cs b/Assets/Scripts/Item.cs index 221426b..dcdac71 100644 --- a/Assets/Scripts/Item.cs +++ b/Assets/Scripts/Item.cs @@ -3,7 +3,7 @@ using UnityEngine; public class Item : MonoBehaviour { private string displayName; private string description; - private int id; + private int id; //TODO: create an actual ID System that makes snens public SpriteRenderer spriteRenderer; public Sprite selectedSprite; public Sprite defaultSprite; @@ -12,6 +12,6 @@ public class Item : MonoBehaviour { this.displayName = displayName; this.description = description; this.id = id; - spriteRenderer.sprite = defaultSprite; // defaultSprite is set in UnityEditor + spriteRenderer.sprite ??= defaultSprite; // defaultSprite is set in UnityEditor } } diff --git a/Assets/Scripts/Items/FishingRod.cs b/Assets/Scripts/Items/FishingRod.cs index 3bc005a..1906e76 100644 --- a/Assets/Scripts/Items/FishingRod.cs +++ b/Assets/Scripts/Items/FishingRod.cs @@ -1,6 +1,12 @@ using UnityEngine; namespace Items { - public class FishingRod : MonoBehaviour { + public class FishingRod : Item, IUsable { + public FishingRod() : base("Fishing Rod", "Can be used to fish fishy fish.", 1) { } + + public void select() { + + } + } } diff --git a/Assets/Scripts/Items/Hoe.cs b/Assets/Scripts/Items/Hoe.cs index 8193330..b6af5a1 100644 --- a/Assets/Scripts/Items/Hoe.cs +++ b/Assets/Scripts/Items/Hoe.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using UnityEngine; namespace Items { - public class Hoe : MonoBehaviour { + public class Hoe : Item { + public Hoe() : base("Hoe", "Used to hoe the ground into farmland.", 2){} } } diff --git a/Assets/Scripts/Items/Scythe.cs b/Assets/Scripts/Items/Scythe.cs index d840d00..2c72eb9 100644 --- a/Assets/Scripts/Items/Scythe.cs +++ b/Assets/Scripts/Items/Scythe.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using UnityEngine; namespace Items { - public class Scythe : MonoBehaviour { + public class Scythe : Item { + public Scythe() : base("Scythe", "Used to cut down crops.", 3){} } } diff --git a/Assets/Scripts/Items/WateringCan.cs b/Assets/Scripts/Items/WateringCan.cs index 018f6c0..947c741 100644 --- a/Assets/Scripts/Items/WateringCan.cs +++ b/Assets/Scripts/Items/WateringCan.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using UnityEngine; namespace Items { - public class WateringCan : MonoBehaviour { + public class WateringCan : Item { + public WateringCan():base("Watering Can", "Used to water planted crops.", 4){} } } diff --git a/Assets/Scripts/Items/Wheat.cs b/Assets/Scripts/Items/Wheat.cs index 0a17ce8..6eda1d7 100644 --- a/Assets/Scripts/Items/Wheat.cs +++ b/Assets/Scripts/Items/Wheat.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using UnityEngine; namespace Items { - public class Wheat : MonoBehaviour { + public class Wheat : Item { + public Wheat() : base("Wheat", "Wheat is a grass widely cultivated for its seed, a cereal grain which is a worldwide staple food.", 5){} } } diff --git a/Assets/Scripts/Items/WheatSeed.cs b/Assets/Scripts/Items/WheatSeed.cs index ebfa25f..471bd53 100644 --- a/Assets/Scripts/Items/WheatSeed.cs +++ b/Assets/Scripts/Items/WheatSeed.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using UnityEngine; namespace Items { - public class WheatSeed : MonoBehaviour { + public class WheatSeed : Item { + public WheatSeed() : base("Wheat Seeds", "When planted on farmland, wheat will grow.", 6){} } } diff --git a/ProjectSettings/RiderScriptEditorPersistedState.asset b/ProjectSettings/RiderScriptEditorPersistedState.asset index 54dbd26..27901ad 100644 --- a/ProjectSettings/RiderScriptEditorPersistedState.asset +++ b/ProjectSettings/RiderScriptEditorPersistedState.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 0} m_Name: m_EditorClassIdentifier: Unity.Rider.Editor:Packages.Rider.Editor:RiderScriptEditorPersistedState - lastWriteTicks: -8585494760213472651 + lastWriteTicks: -8585494757829068137