Basic Item with new scripts and changes to Movables system (#10)

* Basic barrel storage system. * Automatic layer set for tools * You can no longer place two items in the same placeholder * Draggables cam be thrown --------- Co-authored-by: Bartosz Wójcik <bartoszw004@gmail.com>
AGH-Code-Industry · Feb 11, 2024 · 5da8aec · 5da8aec
1 parent 9c4bf51
commit 5da8aec
Show file tree

Hide file tree

Showing 29 changed files with 877 additions and 448 deletions.
diff --git a/Assets/Art/Sprites/Items.meta b/Assets/Art/Sprites/Items.meta
diff --git a/Assets/Art/Sprites/Items/slod-jeczmienny_100.png b/Assets/Art/Sprites/Items/slod-jeczmienny_100.png
diff --git a/Assets/Art/Sprites/Items/slod-jeczmienny_100.png.meta b/Assets/Art/Sprites/Items/slod-jeczmienny_100.png.meta
diff --git a/Assets/Resources/Items/DummyItem.asset → Assets/Resources/Items/DummyItem 1.asset b/Assets/Resources/Items/DummyItem.asset → Assets/Resources/Items/DummyItem 1.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 59070be403ff4283a4f72ef84f4e8879, type: 3}
-  m_Name: DummyItem
+  m_Name: DummyItem 1
   m_EditorClassIdentifier: 
   type: 0
   itemName: Dummy Item

diff --git a/Assets/Resources/Items/DummyItem 1.asset.meta b/Assets/Resources/Items/DummyItem 1.asset.meta
diff --git a/Assets/Resources/Items/Ingredients.meta b/Assets/Resources/Items/Ingredients.meta
diff --git a/Assets/Resources/Items/Ingredients/Barley Malt.asset b/Assets/Resources/Items/Ingredients/Barley Malt.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: 59070be403ff4283a4f72ef84f4e8879, type: 3}
+  m_Name: Barley Malt
+  m_EditorClassIdentifier: 
+  type: 1
+  itemName: Barley Malt
+  description: Basic ingredient
+  prefab: {fileID: 0}
+  uiImage: {fileID: 21300000, guid: aeb3abb4c2106bb42b5317b0c9b3ee06, type: 3}
diff --git a/Assets/Resources/Items/DummyItem.asset.meta → .../Items/Ingredients/Barley Malt.asset.meta b/Assets/Resources/Items/DummyItem.asset.meta → .../Items/Ingredients/Barley Malt.asset.meta