can interact if player has tool selected (in hand))

2025-10-29 12:32:09 +01:00 · 2022-02-18 20:25:35 +01:00
parent 73669eaa3f
commit 3ff90d47c2
30 changed files with 505 additions and 78 deletions
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -435,6 +435,8 @@ GameObject:
  - component: {fileID: 310196956}
  - component: {fileID: 310196957}
  - component: {fileID: 310196958}
+  - component: {fileID: 310196959}
+  - component: {fileID: 310196960}
  m_Layer: 3
  m_Name: Player
  m_TagString: Player
@@ -541,6 +543,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 519420032}
+  - {fileID: 1768964892}
  m_Father: {fileID: 0}
  m_RootOrder: 9
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -606,6 +609,35 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  interactionText: {fileID: 87507994}
  interactionProgressImg: {fileID: 138750307}
+--- !u!114 &310196959
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 310196950}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee2fcb6d299019740bbede78bbc6a1d7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &310196960
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 310196950}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cff3b5ce3863a7442a86b400700ff131, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  item1: {fileID: 11400000, guid: cada8a20c35f0bd4a93d92e1152e5625, type: 2}
+  item2: {fileID: 11400000, guid: a29513e23691eb0408e3b0e1a8e99148, type: 2}
+  selectedItem: {fileID: 0}
+  inventory: {fileID: 0}
+  uiInventory: {fileID: 0}
 --- !u!1 &360525550
 GameObject:
  m_ObjectHideFlags: 0
@@ -643,7 +675,7 @@ MonoBehaviour:
  m_Intensity: 1
  m_LightVolumeIntensity: 1
  m_LightVolumeIntensityEnabled: 0
-  m_ApplyToSortingLayers: bbcf1c00a7c2801a00000000
+  m_ApplyToSortingLayers: bbcf1c00a7c2801a0000000097b7d31b
  m_LightCookieSprite: {fileID: 0}
  m_DeprecatedPointLightCookieSprite: {fileID: 0}
  m_LightOrder: 0
@@ -4378,8 +4410,9 @@ MonoBehaviour:
  interactionType: 2
  holdDuration: 1
  radius: 3
-  centerPoint: {fileID: 0}
+  centerPoint: {fileID: 1335747188}
  harvestDuration: 3
+  toolType: 0
 --- !u!1 &1523942491
 GameObject:
  m_ObjectHideFlags: 0
@@ -14809,6 +14842,90 @@ Tilemap:
    e31: 0
    e32: 0
    e33: 1
+--- !u!1 &1768964891
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1768964892}
+  - component: {fileID: 1768964893}
+  m_Layer: 3
+  m_Name: Hand
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1768964892
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1768964891}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.041, y: 0.212, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 310196954}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &1768964893
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1768964891}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 466859927
+  m_SortingLayer: 1
+  m_SortingOrder: 1
+  m_Sprite: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 0.32, y: 0.32}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 0
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1 &1832736149
 GameObject:
  m_ObjectHideFlags: 0
@@ -28344,6 +28461,10 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications:
+    - target: {fileID: 134544697275079105, guid: 4ca350a347d8520448f562297fbf46d4, type: 3}
+      propertyPath: harvestDuration
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 5128193789106105257, guid: 4ca350a347d8520448f562297fbf46d4, type: 3}
      propertyPath: m_RootOrder
      value: 13
--- a/Assets/Scripts/Interaction.meta
+++ b/Assets/Scripts/Interaction.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6acbaf264fa7d1f4eace556be331ac5a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Interaction/Harvestable.cs
+++ b/Assets/Scripts/Interaction/Harvestable.cs
@@ -10,7 +10,9 @@ public abstract class Harvestable : Interactable
    [Range(0.1f, 99.9f)]
    [SerializeField]
    float harvestDuration = 3f;
-    
+
+    public ToolType toolType;
+
    float harvestTime = 0f;// time for how long the player already "harvested" the object

    /// <summary>
--- a/Assets/Scripts/Interaction/Harvestable.cs.meta
+++ b/Assets/Scripts/Interaction/Harvestable.cs.meta
--- a/Assets/Scripts/Interaction/Interactable.cs
+++ b/Assets/Scripts/Interaction/Interactable.cs
--- a/Assets/Scripts/Interaction/Interactable.cs.meta
+++ b/Assets/Scripts/Interaction/Interactable.cs.meta
--- a/Assets/Scripts/Interaction/PlayerInteraction.cs
+++ b/Assets/Scripts/Interaction/PlayerInteraction.cs
@@ -81,14 +81,20 @@ public class PlayerInteraction : MonoBehaviour
                break;
            case Interactable.InteractionType.Harvest:
                Harvestable harvestable = interactable.GetComponent<Harvestable>();
+                ToolItem toolItem = (ToolItem)GetComponent<InventoryController>().selectedItem;

-                if (Input.GetButton("Interact") && interactable.isInRange())
+                bool isCorrectTool = (toolItem != null && toolItem.toolType == harvestable.toolType);
+                
+
+
+                if (Input.GetButton("Interact") && interactable.isInRange() && isCorrectTool)
                {
                    harvestable.IncreaseHarvestTime();

                    if (harvestable.GetHarvestTime() >= harvestable.GetHarvestDuration())
                    {
                        harvestable.Interact();
+                        harvestable.ResetHarvestTime();
                    }
                }
                break;
--- a/Assets/Scripts/Interaction/PlayerInteraction.cs.meta
+++ b/Assets/Scripts/Interaction/PlayerInteraction.cs.meta
--- a/Assets/Scripts/Interaction/TestLight.cs
+++ b/Assets/Scripts/Interaction/TestLight.cs
--- a/Assets/Scripts/Interaction/TestLight.cs.meta
+++ b/Assets/Scripts/Interaction/TestLight.cs.meta
--- a/Assets/Scripts/Interaction/TreeInteraction.cs
+++ b/Assets/Scripts/Interaction/TreeInteraction.cs
@@ -2,7 +2,14 @@ using UnityEngine;

 public class TreeInteraction : Harvestable
 {
-    
+
+    private void Start()
+    {
+        toolType = ToolType.AXE;
+    }
+
+
+
    public override string GetDescription()
    {
        if (isInRange())
--- a/Assets/Scripts/Interaction/TreeInteraction.cs.meta
+++ b/Assets/Scripts/Interaction/TreeInteraction.cs.meta
--- a/Assets/Scripts/Inventory/FoodItem.cs
+++ b/Assets/Scripts/Inventory/FoodItem.cs
@@ -7,4 +7,9 @@ public class FoodItem : Item
    public int health;
    public int water;
    public int regeneration;
+
+    public override void OnSelect()
+    {
+        throw new System.NotImplementedException();
+    }
 }
--- a/Assets/Scripts/Inventory/Inventory.cs
+++ b/Assets/Scripts/Inventory/Inventory.cs
@@ -25,6 +25,7 @@ public class Inventory : MonoBehaviour
    public delegate void OnItemChanged();
    public OnItemChanged onItemChangedCallback; // 

+    [SerializeField]
    List<Slot> inventory = new List<Slot>();

    public List<Slot> getInventory { get => inventory;}
@@ -33,7 +34,6 @@ public class Inventory : MonoBehaviour
        // Initializes the inventory with a specific number of slots and slotsize.
        // !!!Has to be called bevore adding any items!!!
        // Example createEmptyInventory(5, 10) : 5 Slots with space for 10 items each
-        inventory = new List<Slot>();
        for (int i = 0; i < numberOfSlots; i++)
        {
            inventory.Add(new Slot(maxSpaceOfSlots));
--- a/Assets/Scripts/Inventory/InventoryController.cs
+++ b/Assets/Scripts/Inventory/InventoryController.cs
@@ -6,15 +6,20 @@ public class InventoryController : MonoBehaviour
 {
    [SerializeField] Item item1;// not needed
    [SerializeField] Item item2;// not needed
+    public Item selectedItem;
+
+    Item testItem;
    public Inventory inventory;
    [SerializeField] UI_Inventory uiInventory;
    private void Awake()
    {
        inventory = transform.GetComponent<Inventory>();
        inventory.createEmptyInventory(8,10);
-        
+
+        testItem = Instantiate(item1);
+
        inventory.addItemAt(0, item1, 8);
-        inventory.addItemAt(0, item1, 1);
+        inventory.addItemAt(0, testItem, 1);
        inventory.addItemAt(3, item2, 15);
        inventory.addItemAt(4, item1, 3);

@@ -24,7 +29,9 @@ public class InventoryController : MonoBehaviour
        Debug.Log(inventory.removeItemAt(0, 10));
        Debug.Log(inventory.getInventory[0].Count);
        */ 
-        uiInventory.setInventory(inventory);
+
+
+       // uiInventory.setInventory(inventory);
    }
    void Start()
    {
@@ -34,6 +41,14 @@ public class InventoryController : MonoBehaviour
    // Update is called once per frame
    void Update()
    {
-
+        // FOR DEBUG
+        if (Input.GetKeyDown(KeyCode.X))
+        {
+            testItem.Select();
+            if(testItem.isSelected)
+                selectedItem = testItem;
+            else
+                selectedItem = null;                   
+        }
    }
 }
--- a/Assets/Scripts/Inventory/Item.cs
+++ b/Assets/Scripts/Inventory/Item.cs
@@ -3,10 +3,19 @@ using System.Collections.Generic;
 using UnityEngine;

 [CreateAssetMenu(fileName = "Item", menuName = "Items/Item", order = 1)]
-public class Item : ScriptableObject
+public abstract class Item : ScriptableObject
 {
    public new string name;
    public int id;
    public bool isStackable;
    public Sprite sprite;
+    public bool isSelected;
+
+    public abstract void OnSelect();
+
+    public void Select()
+    {
+        isSelected = !isSelected;
+        OnSelect();
+    }
 }
--- a/Assets/Scripts/Inventory/Items/Tools.meta
+++ b/Assets/Scripts/Inventory/Items/Tools.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 07c440f0b142b6c43818e32e4a43686c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Inventory/Items/Tools/Stick.asset
+++ b/Assets/Scripts/Inventory/Items/Tools/Stick.asset
@@ -0,0 +1,20 @@
+%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: c9a450f431b33414ab3a1f3b08250700, type: 3}
+  m_Name: Stick
+  m_EditorClassIdentifier: 
+  name: stick
+  id: 10
+  isStackable: 0
+  sprite: {fileID: 21300000, guid: 8994265d0b3152b4cb238bdf03e8d440, type: 3}
+  isSelected: 0
+  toolType: 0
--- a/Assets/Scripts/Inventory/Items/Tools/Stick.asset.meta
+++ b/Assets/Scripts/Inventory/Items/Tools/Stick.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cada8a20c35f0bd4a93d92e1152e5625
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Inventory/ResourceItem.cs
+++ b/Assets/Scripts/Inventory/ResourceItem.cs
@@ -0,0 +1,11 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+[CreateAssetMenu(fileName = "FoodItem", menuName = "Items/FoodItem", order = 2)]
+public class ResourceItem : Item
+{
+    public override void OnSelect()
+    {
+        throw new System.NotImplementedException();
+    }
+}
--- a/Assets/Scripts/Inventory/ResourceItem.cs.meta
+++ b/Assets/Scripts/Inventory/ResourceItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0fae7bba50a98204883e78d8d6c96fc2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Inventory/ToolItem.cs
+++ b/Assets/Scripts/Inventory/ToolItem.cs
@@ -0,0 +1,26 @@
+using UnityEngine;
+
+[CreateAssetMenu(fileName = "ToolItem", menuName = "Items/Tool", order = 2)]
+public class ToolItem : Item
+{
+    
+
+    public ToolType toolType;
+    float durability = 1f;
+
+    SpriteRenderer playerHandSpriteRenderer;
+
+    public override void OnSelect()
+    {
+        playerHandSpriteRenderer = GameObject.Find("Player").transform.Find("Hand").gameObject.GetComponent<SpriteRenderer>();
+        if (isSelected)
+        {
+            playerHandSpriteRenderer.GetComponent<SpriteRenderer>().sprite = sprite;
+        }
+        else
+        {
+            playerHandSpriteRenderer.GetComponent<SpriteRenderer>().sprite = null;
+        }
+        
+    }
+}
--- a/Assets/Scripts/Inventory/ToolItem.cs.meta
+++ b/Assets/Scripts/Inventory/ToolItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c9a450f431b33414ab3a1f3b08250700
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Inventory/ToolType.cs
+++ b/Assets/Scripts/Inventory/ToolType.cs
@@ -0,0 +1,11 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public enum ToolType
+{
+    AXE,
+    PICKAXE,
+    HOE,
+}
+
--- a/Assets/Scripts/Inventory/ToolType.cs.meta
+++ b/Assets/Scripts/Inventory/ToolType.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4f9fcb5700fbcfa4d93940e88f197200
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/stick.png
+++ b/Assets/Sprites/stick.png
--- a/Assets/Sprites/stick.png.meta
+++ b/Assets/Sprites/stick.png.meta
@@ -0,0 +1,134 @@
+fileFormatVersion: 2
+guid: 8994265d0b3152b4cb238bdf03e8d440
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 16
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -47,3 +47,6 @@ TagManager:
  - name: Default
    uniqueID: 0
    locked: 0
+  - name: ItemInHand
+    uniqueID: 466859927
+    locked: 0
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -6,10 +6,10 @@ EditorUserSettings:
  serializedVersion: 4
  m_ConfigSettings:
    RecentlyUsedSceneGuid-0:
-      value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
+      value: 565403025d065d5e5a5a0a7445205c44124e192b7b7f733375791f6be4b76d39
      flags: 0
    RecentlyUsedSceneGuid-1:
-      value: 565403025d065d5e5a5a0a7445205c44124e192b7b7f733375791f6be4b76d39
+      value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
      flags: 0
    vcSharedLogLevel:
      value: 0d5e400f0650
--- a/UserSettings/Layouts/default-2021.dwlt
+++ b/UserSettings/Layouts/default-2021.dwlt
@@ -14,16 +14,16 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_PixelRect:
    serializedVersion: 2
-    x: 0
-    y: 43
-    width: 1920
+    x: -1912
+    y: 51
+    width: 1904
    height: 989
  m_ShowMode: 4
-  m_Title: Scene
+  m_Title: Inspector
  m_RootView: {fileID: 2}
  m_MinSize: {x: 875, y: 350}
  m_MaxSize: {x: 10000, y: 10000}
-  m_Maximized: 1
+  m_Maximized: 0
 --- !u!114 &2
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -44,7 +44,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1920
+    width: 1904
    height: 989
  m_MinSize: {x: 875, y: 300}
  m_MaxSize: {x: 10000, y: 10000}
@@ -69,7 +69,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1920
+    width: 1904
    height: 30
  m_MinSize: {x: 0, y: 0}
  m_MaxSize: {x: 0, y: 0}
@@ -91,7 +91,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 969
-    width: 1920
+    width: 1904
    height: 20
  m_MinSize: {x: 0, y: 0}
  m_MaxSize: {x: 0, y: 0}
@@ -114,12 +114,12 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 30
-    width: 1920
+    width: 1904
    height: 939
  m_MinSize: {x: 300, y: 200}
  m_MaxSize: {x: 24288, y: 16192}
  vertical: 0
-  controlID: 42
+  controlID: 58
 --- !u!114 &6
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -139,12 +139,12 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1476
+    width: 1469
    height: 939
  m_MinSize: {x: 200, y: 200}
  m_MaxSize: {x: 16192, y: 16192}
  vertical: 1
-  controlID: 43
+  controlID: 77
 --- !u!114 &7
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -164,12 +164,12 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1476
+    width: 1469
    height: 615
  m_MinSize: {x: 200, y: 100}
  m_MaxSize: {x: 16192, y: 8096}
  vertical: 0
-  controlID: 44
+  controlID: 64
 --- !u!114 &8
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -187,10 +187,10 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 304
+    width: 302
    height: 615
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
  m_ActualView: {fileID: 13}
  m_Panes:
  - {fileID: 13}
@@ -211,9 +211,9 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 304
+    x: 302
    y: 0
-    width: 1172
+    width: 1167
    height: 615
  m_MinSize: {x: 202, y: 221}
  m_MaxSize: {x: 4002, y: 4021}
@@ -240,7 +240,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 615
-    width: 1476
+    width: 1469
    height: 324
  m_MinSize: {x: 231, y: 271}
  m_MaxSize: {x: 10001, y: 10021}
@@ -265,12 +265,12 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 1476
+    x: 1469
    y: 0
-    width: 444
+    width: 435
    height: 939
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
  m_ActualView: {fileID: 17}
  m_Panes:
  - {fileID: 17}
@@ -296,10 +296,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 304
+    x: -1616
    y: 73
    width: 1170
-    height: 594
+    height: 625
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -310,7 +310,7 @@ MonoBehaviour:
  m_ShowGizmos: 0
  m_TargetDisplay: 0
  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 1170, y: 573}
+  m_TargetSize: {x: 1170, y: 604}
  m_TextureFilterMode: 0
  m_TextureHideFlags: 61
  m_RenderIMGUI: 1
@@ -327,8 +327,8 @@ MonoBehaviour:
    vZoomLockedByDefault: 0
    m_HBaseRangeMin: -585
    m_HBaseRangeMax: 585
-    m_VBaseRangeMin: -286.5
-    m_VBaseRangeMax: 286.5
+    m_VBaseRangeMin: -302
+    m_VBaseRangeMax: 302
    m_HAllowExceedBaseRangeMin: 1
    m_HAllowExceedBaseRangeMax: 1
    m_VAllowExceedBaseRangeMin: 1
@@ -337,7 +337,7 @@ MonoBehaviour:
    m_HSlider: 0
    m_VSlider: 0
    m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 1
+    m_EnableMouseInput: 0
    m_EnableSliderZoomHorizontal: 0
    m_EnableSliderZoomVertical: 0
    m_UniformScale: 1
@@ -347,9 +347,9 @@ MonoBehaviour:
      x: 0
      y: 21
      width: 1170
-      height: 573
+      height: 604
    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 585, y: 286.5}
+    m_Translation: {x: 585, y: 302}
    m_MarginLeft: 0
    m_MarginRight: 0
    m_MarginTop: 0
@@ -357,12 +357,12 @@ MonoBehaviour:
    m_LastShownAreaInsideMargins:
      serializedVersion: 2
      x: -585
-      y: -286.5
+      y: -302
      width: 1170
-      height: 573
+      height: 604
    m_MinimalGUI: 1
  m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 1170, y: 594}
+  m_LastWindowPixelSize: {x: 1170, y: 625}
  m_ClearInEditMode: 1
  m_NoCameraWarning: 1
  m_LowResolutionForAspectRatios: 01000000000000000000
@@ -388,9 +388,9 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 0
-    y: 73
-    width: 303
+    x: -1912
+    y: 81
+    width: 301
    height: 594
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
@@ -399,9 +399,9 @@ MonoBehaviour:
  m_SceneHierarchy:
    m_TreeViewState:
      scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 2cfbffff
-      m_LastClickedID: -1236
-      m_ExpandedIDs: 2efbffffa66a0000
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: 48e2ffff9ae3ffff2efbffff
      m_RenameOverlay:
        m_UserAcceptedRename: 0
        m_Name: 
@@ -445,9 +445,9 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 304
-    y: 73
-    width: 1170
+    x: -1610
+    y: 81
+    width: 1165
    height: 594
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
@@ -672,9 +672,9 @@ MonoBehaviour:
  m_PlayAudio: 0
  m_AudioPlay: 0
  m_Position:
-    m_Target: {x: 5.149206, y: -2.6883645, z: 0.056333315}
+    m_Target: {x: 4.236046, y: 1.978678, z: 0.2763816}
    speed: 2
-    m_Value: {x: 5.149206, y: -2.6883645, z: 0.056333315}
+    m_Value: {x: 4.236046, y: 1.978678, z: 0.2763816}
  m_RenderMode: 0
  m_CameraMode:
    drawMode: 0
@@ -725,9 +725,9 @@ MonoBehaviour:
    speed: 2
    m_Value: {x: 0, y: 0, z: 0, w: 1}
  m_Size:
-    m_Target: 12.813291
+    m_Target: 7.5358753
    speed: 2
-    m_Value: 12.813291
+    m_Value: 7.5358753
  m_Ortho:
    m_Target: 1
    speed: 2
@@ -772,9 +772,9 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 0
-    y: 688
-    width: 1475
+    x: -1912
+    y: 696
+    width: 1468
    height: 303
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
@@ -793,22 +793,22 @@ MonoBehaviour:
    m_SkipHidden: 0
    m_SearchArea: 1
    m_Folders:
-    - Assets/Sprites
+    - Assets/Scripts/Inventory
    m_Globs: []
    m_OriginalText: 
  m_ViewMode: 1
  m_StartGridSize: 74
  m_LastFolders:
-  - Assets/Sprites
+  - Assets/Scripts/Inventory
  m_LastFoldersGridSize: 74
  m_LastProjectPath: M:\UnityProjects\2d-top-down
  m_LockTracker:
    m_IsLocked: 0
  m_FolderTreeState:
    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 906f0000
-    m_LastClickedID: 28560
-    m_ExpandedIDs: 000000006e6f00005081000000ca9a3bffffff7f
+    m_SelectedIDs: 0e700000
+    m_LastClickedID: 28686
+    m_ExpandedIDs: 000000009a6f00009c6f0000c66f00000e7000001270000000ca9a3bffffff7f
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@@ -836,7 +836,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: 
    m_LastClickedID: 0
-    m_ExpandedIDs: 000000006e6f0000
+    m_ExpandedIDs: 000000009a6f00009c6f0000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@@ -912,10 +912,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 0
-    y: 688
-    width: 1474
-    height: 303
+    x: -1920
+    y: 719
+    width: 1475
+    height: 320
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -940,9 +940,9 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 1476
-    y: 73
-    width: 443
+    x: -443
+    y: 81
+    width: 434
    height: 918
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
@@ -955,7 +955,7 @@ MonoBehaviour:
    m_ControlHash: -371814159
    m_PrefName: Preview_InspectorPreview
  m_LastInspectedObjectInstanceID: -1
-  m_LastVerticalScrollValue: 41
+  m_LastVerticalScrollValue: 0
  m_GlobalObjectId: 
  m_InspectorMode: 0
  m_LockTracker: