Merge branch 'master' of https://github.com/TSKsmiley/RedDead2D

TSKsmiley · Mar 11, 2021 · 1ba70f6 · 1ba70f6
2 parents bf6f54e + f45e945
commit 1ba70f6
Show file tree

Hide file tree

Showing 10 changed files with 161 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -54,3 +54,4 @@ crashlytics-build.properties
 .idea/.idea.RedDead2D/.idea/contentModel.xml
 .idea/.idea.RedDead2D/.idea/workspace.xml
 .idea/.idea.RedDead2D/.idea/contentModel.xml
+.idea/.idea.RedDead2D/.idea/workspace.xml
diff --git a/.idea/.idea.RedDead2D/.idea/contentModel.xml b/.idea/.idea.RedDead2D/.idea/contentModel.xml
diff --git a/.idea/.idea.RedDead2D/.idea/workspace.xml b/.idea/.idea.RedDead2D/.idea/workspace.xml
diff --git a/Assets/Scriptable Objects/Items.meta b/Assets/Scriptable Objects/Items.meta
diff --git a/Assets/Scripts/Inventory.meta b/Assets/Scripts/Inventory.meta
diff --git a/Assets/Scripts/Inventory/Items.meta b/Assets/Scripts/Inventory/Items.meta
diff --git a/Assets/Scripts/Inventory/Items/Item.cs b/Assets/Scripts/Inventory/Items/Item.cs
@@ -0,0 +1,13 @@
+using UnityEngine;
+
+namespace Inventory.Items
+{
+    [CreateAssetMenu(fileName = "Item", menuName = "Items/item")]
+    public class Item : ScriptableObject
+    {
+        public new string name;
+        public string description;
+
+        public Sprite sprite;
+    }
+}
diff --git a/Assets/Scripts/Inventory/Items/Item.cs.meta b/Assets/Scripts/Inventory/Items/Item.cs.meta
diff --git a/Assets/Scripts/Inventory/Items/Weapon.cs b/Assets/Scripts/Inventory/Items/Weapon.cs
@@ -0,0 +1,15 @@
+using UnityEngine;
+
+namespace Inventory.Items
+{
+    [CreateAssetMenu(fileName = "Item", menuName = "Items/weapon")]
+    public class ItemWeapon : ScriptableObject
+    {
+        public new string name;
+        public string description;
+
+        public Sprite sprite;
+
+        public int damage;
+    }
+}
diff --git a/Assets/Scripts/Inventory/Items/Weapon.cs.meta b/Assets/Scripts/Inventory/Items/Weapon.cs.meta