Merge remote-tracking branch 'origin/master'

Assembly-CSharp-Editor.csproj

@@ -2,10 +2,8 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <_TargetFrameworkDirectories>non_empty_path_generated_by_unity.rider.package</_TargetFrameworkDirectories>
+    <CscToolPath>C:\Program Files\Unity\Hub\Editor\2020.3.32f1\Editor\Data\Tools\RoslynScripts</CscToolPath>
-    <_FullFrameworkReferenceAssemblyPaths>non_empty_path_generated_by_unity.rider.package</_FullFrameworkReferenceAssemblyPaths>
+    <CscToolExe>unity_csc.bat</CscToolExe>
-    <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
-  <CodeAnalysisRuleSet></CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,8 +11,7 @@
     <ProductVersion>10.0.20506</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <RootNamespace></RootNamespace>
-    <ProjectGuid>{7cc02776-5953-02f0-1d58-e2f51d95c564}</ProjectGuid>
+    <ProjectGuid>{7627C07C-5359-F002-1D58-E2F51D95C564}</ProjectGuid>
-    <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AssemblyName>Assembly-CSharp-Editor</AssemblyName>
@@ -30,9 +27,8 @@
     <DefineConstants>DEBUG;TRACE;UNITY_2020_3_32;UNITY_2020_3;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_UNITYTLS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER;NET_STANDARD_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
+    <NoWarn>0169</NoWarn>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -40,9 +36,8 @@
     <OutputPath>Temp\bin\Release\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
+    <NoWarn>0169</NoWarn>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup>
     <NoConfig>true</NoConfig>
@@ -278,29 +273,26 @@
  <Reference Include="UnityEditor.Graphs">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEditor.Graphs.dll</HintPath>
  </Reference>
- <Reference Include="UnityEditor.WebGL.Extensions">
- <HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll</HintPath>
- </Reference>
  <Reference Include="UnityEditor.WindowsStandalone.Extensions">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Plastic.Newtonsoft.Json">
- <HintPath>C:/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/Unity.Plastic.Newtonsoft.Json.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/Unity.Plastic.Newtonsoft.Json.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Plastic.Antlr3.Runtime">
- <HintPath>C:/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/Unity.Plastic.Antlr3.Runtime.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/Unity.Plastic.Antlr3.Runtime.dll</HintPath>
  </Reference>
  <Reference Include="unityplastic">
- <HintPath>C:/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/unityplastic.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/unityplastic.dll</HintPath>
  </Reference>
  <Reference Include="log4netPlastic">
- <HintPath>C:/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/log4netPlastic.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/log4netPlastic.dll</HintPath>
  </Reference>
  <Reference Include="HardLight2D">
- <HintPath>C:/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll</HintPath>
  </Reference>
  <Reference Include="nunit.framework">
- <HintPath>C:/Scriptum/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll</HintPath>
  </Reference>
  <Reference Include="mscorlib">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
@@ -651,106 +643,107 @@
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.XDocument.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.TestRunner">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/UnityEngine.TestRunner.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.TestRunner.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.TestRunner">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/UnityEditor.TestRunner.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.TestRunner.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Animation.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.InternalAPIEngineBridge.001">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll</HintPath>
  </Reference>
  <Reference Include="Unity.VSCode.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.PixelPerfect">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Tilemap.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll</HintPath>
  </Reference>
  <Reference Include="PsdPlugin">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll</HintPath>
  </Reference>
  <Reference Include="Unity.TextMeshPro.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.VisualStudio.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Timeline">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
  </Reference>
  <Reference Include="Unity.TextMeshPro">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.IK.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Sprite.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Psdimporter.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Path.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.InternalAPIEditorBridge.001">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.UI">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
  </Reference>
  <Reference Include="Unity.PlasticSCM.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Rider.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.UI">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Mathematics">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.IK.Runtime">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Animation.Triangle.Runtime">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Animation.Runtime">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.PixelPerfect.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Timeline.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Mathematics.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Common.Runtime">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.SpriteShape.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Common.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.SpriteShape.Runtime">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll</HintPath>
  </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="Assembly-CSharp.csproj">
-      <Project>{e0f48af5-6d3e-b154-523d-8f755dc8e665}</Project>
+      <Project>{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}</Project>
       <Name>Assembly-CSharp</Name>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

Assembly-CSharp.csproj

@@ -2,10 +2,8 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <_TargetFrameworkDirectories>non_empty_path_generated_by_unity.rider.package</_TargetFrameworkDirectories>
+    <CscToolPath>C:\Program Files\Unity\Hub\Editor\2020.3.32f1\Editor\Data\Tools\RoslynScripts</CscToolPath>
-    <_FullFrameworkReferenceAssemblyPaths>non_empty_path_generated_by_unity.rider.package</_FullFrameworkReferenceAssemblyPaths>
+    <CscToolExe>unity_csc.bat</CscToolExe>
-    <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
-  <CodeAnalysisRuleSet></CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,8 +11,7 @@
     <ProductVersion>10.0.20506</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <RootNamespace></RootNamespace>
-    <ProjectGuid>{e0f48af5-6d3e-b154-523d-8f755dc8e665}</ProjectGuid>
+    <ProjectGuid>{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}</ProjectGuid>
-    <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AssemblyName>Assembly-CSharp</AssemblyName>
@@ -30,9 +27,8 @@
     <DefineConstants>DEBUG;TRACE;UNITY_2020_3_32;UNITY_2020_3;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_UNITYTLS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_STANDARD_2_0;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
+    <NoWarn>0169</NoWarn>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -40,9 +36,8 @@
     <OutputPath>Temp\bin\Release\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
+    <NoWarn>0169</NoWarn>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup>
     <NoConfig>true</NoConfig>
@@ -89,6 +84,7 @@
      <Compile Include="Assets\Scripts\Objects\GoldOre.cs" />
      <Compile Include="Assets\Scripts\REFACTORING\Domain\Enum\PanelTypeEnum.cs" />
      <Compile Include="Assets\Scripts\ProceduralGeneration\Graph.cs" />
+     <Compile Include="Assets\Scripts\REFACTORING\Story\WizardHouse\DoorBlocking.cs" />
      <Compile Include="Assets\Scripts\REFACTORING\Application\Mission\Manager\ConditionManager.cs" />
      <Compile Include="Assets\Scripts\REFACTORING\Domain\Enum\SystemLanguageEnum.cs" />
      <Compile Include="Assets\Scripts\SceneManager\NPC\NPCManager.cs" />
@@ -208,6 +204,7 @@
      <Compile Include="Assets\Scripts\SaveSoundSettings.cs" />
      <Compile Include="Assets\Scripts\MenuGUI.cs" />
      <Compile Include="Assets\Scripts\REFACTORING\Application\Dialogue\Panel\IPanel.cs" />
+     <Compile Include="Assets\Scripts\REFACTORING\Application\Tools\MinionRespowner.cs" />
      <Compile Include="Assets\Scripts\SaveSystem.cs" />
      <Compile Include="Assets\Scripts\AnimatedDoorBehaviour.cs" />
      <Compile Include="Assets\Scripts\REFACTORING\Application\Enemy\EnemyDrop.cs" />
@@ -231,6 +228,7 @@
      <Compile Include="Assets\_\Stuff\GridPathfinding\LastMoveTo.cs" />
      <Compile Include="Assets\Scripts\SceneManager\SaveItem\SaveEquitableItemSystem.cs" />
      <Compile Include="Assets\Scripts\REFACTORING\Application\Shared\Mapper\IModelMapper.cs" />
+     <Compile Include="Assets\Scripts\REFACTORING\Story\Dungeon\Wizard\BattleWizard.cs" />
      <Compile Include="Assets\Scripts\REFACTORING\Models\Panel\Slot\ShopSlot.cs" />
      <Compile Include="Assets\Scripts\REFACTORING\Application\Mission\Condition\CollectMissionCondition.cs" />
      <Compile Include="Assets\Scripts\REFACTORING\Application\Shared\Event\UseItemEvent.cs" />
@@ -324,6 +322,7 @@
      <Compile Include="Assets\OpenPanelOnCollision.cs" />
      <Compile Include="Assets\Scripts\REFACTORING\Models\Chest\ChestData.cs" />
      <Compile Include="Assets\StickToObject.cs" />
+     <Compile Include="Assets\MoveTombstone.cs" />
      <Compile Include="Assets\Scripts\SaveController.cs" />
      <Compile Include="Assets\Scripts\REFACTORING\Application\Panel\Inventory\SceneInventoryDataLoader.cs" />
      <Compile Include="Assets\Scripts\NPCs&apos; Scripts\NPCDialogue.cs" />
@@ -576,7 +575,7 @@
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.UnityConnectModule.dll</HintPath>
  </Reference>
  <Reference Include="HardLight2D">
- <HintPath>C:/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll</HintPath>
  </Reference>
  <Reference Include="netstandard">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll</HintPath>
@@ -924,94 +923,94 @@
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Animation.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.InternalAPIEngineBridge.001">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll</HintPath>
  </Reference>
  <Reference Include="Unity.VSCode.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.PixelPerfect">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Tilemap.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll</HintPath>
  </Reference>
  <Reference Include="PsdPlugin">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll</HintPath>
  </Reference>
  <Reference Include="Unity.TextMeshPro.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.VisualStudio.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Timeline">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
  </Reference>
  <Reference Include="Unity.TextMeshPro">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.IK.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Sprite.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Psdimporter.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Path.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.InternalAPIEditorBridge.001">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.UI">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
  </Reference>
  <Reference Include="Unity.PlasticSCM.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Rider.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.UI">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Mathematics">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.IK.Runtime">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Animation.Triangle.Runtime">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Animation.Runtime">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.PixelPerfect.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Timeline.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Mathematics.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Common.Runtime">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.SpriteShape.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Common.Editor">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.SpriteShape.Runtime">
- <HintPath>C:/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll</HintPath>
+ <HintPath>C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll</HintPath>
  </Reference>
   </ItemGroup>
   <ItemGroup>

Assets/MoveTombstone.cs

@@ -0,0 +1,175 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class MoveTombstone : MonoBehaviour
+{
+    public string position;
+    public float x;
+    public float y;
+    public Vector3 temp;
+    public string tombstone;
+    public string goal;
+    public float speed = 3f;
+    public string pos;
+
+    Animator m_Animator;
+    public string m_ClipName;
+    AnimatorClipInfo[] m_CurrentClipInfo;
+
+    public GameObject player;
+
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        speed = 100f;
+        x = transform.position.x;
+        y = transform.position.y;
+        position = PlayerPrefs.GetString(tombstone);
+        if(position == "top")
+        {
+            temp.x = x;
+            temp.y = y + 1;
+            goal = "set";
+            pos = "top";
+        }
+        else if (position == "bottom")
+        {
+            temp.x = x;
+            temp.y = y - 1;
+            goal = "set";
+            pos = "bottom";
+        }
+        else if (position == "right")
+        {
+            temp.x = x + 1;
+            temp.y = y;
+            goal = "set";
+            pos = "right";
+        }
+        else if (position == "left")
+        {
+            temp.y = y;
+            temp.x = x - 1;
+            goal = "set";
+            pos = "left";
+        }
+
+        if (x == transform.position.x && y == transform.position.y)
+        {
+            PlayerPrefs.SetString(tombstone, "start");
+        }
+        player = GameObject.FindWithTag("Player");
+        speed = 3f;
+
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        position = PlayerPrefs.GetString(tombstone);
+        if (goal == "set")
+        {
+            transform.position = Vector3.MoveTowards(transform.position, temp, speed * Time.deltaTime);
+        }            
+        if(transform.position == temp)
+        {
+            goal = "nothing";
+            PlayerPrefs.SetString(tombstone, pos);
+        }
+        m_Animator = player.GetComponent<Animator>();
+        m_CurrentClipInfo = this.m_Animator.GetCurrentAnimatorClipInfo(0);
+        m_ClipName = m_CurrentClipInfo[0].clip.name;
+    }
+
+
+    void OnTriggerEnter2D(Collider2D collision)
+    {
+        ///For attacking player
+        if (collision.tag == "HitboxTop")
+        {
+            if(m_ClipName == "IdleUp" || m_ClipName =="WalkUp")
+            {
+                if (position == "start" && goal != "set")
+                {
+                    temp.x = x;
+                    temp.y = y + 1;
+                    goal = "set";
+                    pos = "top";
+                }
+                else if (position == "bottom" && goal != "set")
+                {
+                    temp.x = x;
+                    temp.y = y;
+                    goal = "set";
+                    pos = "start";
+                }
+            }
+
+        }
+        else if (collision.tag == "HitboxBottom")
+        {
+            if (m_ClipName == "IdleDown" || m_ClipName == "WalkDown")
+            {
+                if (position == "start" && goal != "set")
+                {
+                    temp.x = x;
+                    temp.y = y - 1;
+                    goal = "set";
+                    pos = "bottom";
+                }
+                else if (position == "top" && goal != "set")
+                {
+                    temp.x = x;
+                    temp.y = y;
+                    goal = "set";
+                    pos = "start";
+                }
+            }
+        }
+        else if (collision.tag == "HitboxRight")
+        {
+            if (m_ClipName == "IdleRight" || m_ClipName == "WalkRight")
+            {
+                if (position == "start" && goal != "set")
+                {
+                    temp.x = x + 1;
+                    temp.y = y;
+                    goal = "set";
+                    pos = "right";
+                }
+                else if (position == "left" && goal != "set")
+                {
+                    temp.x = x;
+                    temp.y = y;
+                    goal = "set";
+                    pos = "start";
+                }
+            }
+        }
+        else if (collision.tag == "HitboxLeft")
+        {
+            if (m_ClipName == "IdleLeft" || m_ClipName == "WalkLeft")
+            {
+                if (position == "start" && goal != "set")
+                {
+                    temp.x = x - 1;
+                    temp.y = y;
+                    goal = "set";
+                    pos = "left";
+                }
+                else if (position == "right" && goal != "set")
+                {
+                    temp.x = x;
+                    temp.y = y;
+                    goal = "set";
+                    pos = "start";
+                }
+            }
+        }
+    }
+
+
+
+}

Assets/MoveTombstone.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8d0c116465fe18f49addcc4e95a35f0c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Dialogue/Tombstones.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9d9db62bde18b7b4492ccb8cae84e1fe
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Dialogue/Tombstones/TombstoneEast2Dial.asset

@@ -0,0 +1,25 @@
+%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: 06201cadd951bcc4db5fccaa01783060, type: 3}
+  m_Name: TombstoneEast2Dial
+  m_EditorClassIdentifier: 
+  SpeakerName: Kabix015
+  CurrentStep: 0
+  DialogueSteps:
+  - Header: Kabix015
+    WasDisplayed: 0
+    ListOfSentences:
+    - Sentence: Carl Easton
+      Buttons: []
+    EndOfDialogueStepAction:
+      m_PersistentCalls:
+        m_Calls: []

Assets/Resources/Dialogue/Tombstones/TombstoneEast2Dial.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3503bbfd040a1c341bef7e0eb801ed76
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Dialogue/Tombstones/TombstoneEast2MultiDial.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: 45b41589283138641ba006c2243b0637, type: 3}
+  m_Name: TombstoneEast2MultiDial
+  m_EditorClassIdentifier: 
+  SpeakerName: Kabix015
+  CurrentDialogue: 0
+  Dialogues:
+  - Key: 0
+    Value: {fileID: 11400000, guid: 3503bbfd040a1c341bef7e0eb801ed76, type: 2}

Assets/Resources/Dialogue/Tombstones/TombstoneEast2MultiDial.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f6f2f4394e1b4bd40bb8de25fac202e3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Dialogue/Tombstones/TombstoneEastDial.asset

@@ -0,0 +1,25 @@
+%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: 06201cadd951bcc4db5fccaa01783060, type: 3}
+  m_Name: TombstoneEastDial
+  m_EditorClassIdentifier: 
+  SpeakerName: Kabix015
+  CurrentStep: 0
+  DialogueSteps:
+  - Header: Kabix015
+    WasDisplayed: 0
+    ListOfSentences:
+    - Sentence: Thomas Eastwood
+      Buttons: []
+    EndOfDialogueStepAction:
+      m_PersistentCalls:
+        m_Calls: []

Assets/Resources/Dialogue/Tombstones/TombstoneEastDial.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d9dbc00923ea13344887c151afb45885
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Dialogue/Tombstones/TombstoneEastMultiDial.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: 45b41589283138641ba006c2243b0637, type: 3}
+  m_Name: TombstoneEastMultiDial
+  m_EditorClassIdentifier: 
+  SpeakerName: Kabix015
+  CurrentDialogue: 0
+  Dialogues:
+  - Key: 0
+    Value: {fileID: 11400000, guid: d9dbc00923ea13344887c151afb45885, type: 2}

Assets/Resources/Dialogue/Tombstones/TombstoneEastMultiDial.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f6cee7d6b05d61f4fb5e8f29ae4cda4d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Dialogue/Tombstones/TombstoneSouthDial.asset

@@ -0,0 +1,25 @@
+%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: 06201cadd951bcc4db5fccaa01783060, type: 3}
+  m_Name: TombstoneSouthDial
+  m_EditorClassIdentifier: 
+  SpeakerName: Kabix015
+  CurrentStep: 0
+  DialogueSteps:
+  - Header: Kabix015
+    WasDisplayed: 0
+    ListOfSentences:
+    - Sentence: Evan Southgate
+      Buttons: []
+    EndOfDialogueStepAction:
+      m_PersistentCalls:
+        m_Calls: []

Assets/Resources/Dialogue/Tombstones/TombstoneSouthDial.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: db810e9565d3f5d4dae007428749a867
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Dialogue/Tombstones/TombstoneSouthMultiDial.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: 45b41589283138641ba006c2243b0637, type: 3}
+  m_Name: TombstoneSouthMultiDial
+  m_EditorClassIdentifier: 
+  SpeakerName: Kabix015
+  CurrentDialogue: 0
+  Dialogues:
+  - Key: 0
+    Value: {fileID: 11400000, guid: db810e9565d3f5d4dae007428749a867, type: 2}

Assets/Resources/Dialogue/Tombstones/TombstoneSouthMultiDial.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d977b7245cf53d848908a2ebe402cdaa
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Dialogue/Tombstones/TombstoneWest2Dial.asset

@@ -0,0 +1,25 @@
+%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: 06201cadd951bcc4db5fccaa01783060, type: 3}
+  m_Name: TombstoneWest2Dial
+  m_EditorClassIdentifier: 
+  SpeakerName: Kabix015
+  CurrentStep: 0
+  DialogueSteps:
+  - Header: Kabix015
+    WasDisplayed: 0
+    ListOfSentences:
+    - Sentence: Felicity West
+      Buttons: []
+    EndOfDialogueStepAction:
+      m_PersistentCalls:
+        m_Calls: []

Assets/Resources/Dialogue/Tombstones/TombstoneWest2Dial.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1fe9f4237b9197a4c8bc8ba83ea10045
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Dialogue/Tombstones/TombstoneWest2MultiDial.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: 45b41589283138641ba006c2243b0637, type: 3}
+  m_Name: TombstoneWest2MultiDial
+  m_EditorClassIdentifier: 
+  SpeakerName: Kabix015
+  CurrentDialogue: 0
+  Dialogues:
+  - Key: 0
+    Value: {fileID: 11400000, guid: 1fe9f4237b9197a4c8bc8ba83ea10045, type: 2}

Assets/Resources/Dialogue/Tombstones/TombstoneWest2MultiDial.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 92f52c87256e3b04a98c17bf10e32c0a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Dialogue/Tombstones/TombstoneWestDial.asset

@@ -0,0 +1,25 @@
+%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: 06201cadd951bcc4db5fccaa01783060, type: 3}
+  m_Name: TombstoneWestDial
+  m_EditorClassIdentifier: 
+  SpeakerName: Kabix015
+  CurrentStep: 0
+  DialogueSteps:
+  - Header: Kabix015
+    WasDisplayed: 0
+    ListOfSentences:
+    - Sentence: Wes Hazelwood
+      Buttons: []
+    EndOfDialogueStepAction:
+      m_PersistentCalls:
+        m_Calls: []

Assets/Resources/Dialogue/Tombstones/TombstoneWestDial.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 97bae72bfd6e410478656b01806f8eda
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Dialogue/Tombstones/TombstoneWestMultiDial.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: 45b41589283138641ba006c2243b0637, type: 3}
+  m_Name: TombstoneWestMultiDial
+  m_EditorClassIdentifier: 
+  SpeakerName: Kabix015
+  CurrentDialogue: 0
+  Dialogues:
+  - Key: 0
+    Value: {fileID: 11400000, guid: 97bae72bfd6e410478656b01806f8eda, type: 2}

Assets/Resources/Dialogue/Tombstones/TombstoneWestMultiDial.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2d828ff9b6679bf4ba037901c3cbf006
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Items/BleedingSword.asset

@@ -0,0 +1,32 @@
+%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: a0c176e87b3c91641897c23dc27e92a0, type: 3}
+  m_Name: BleedingSword
+  m_EditorClassIdentifier: 
+  id: 0
+  name: BleedingSword
+  description: Sword made from the blood of your enemies
+  level: 0
+  value: 3
+  image: {fileID: 7296131321258663700, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
+  itemModel: {fileID: 5830507499881365574, guid: 690a7b48bf05f774b9db15ce3565605c, type: 3}
+  price: 120
+  useEffect:
+    m_PersistentCalls:
+      m_Calls: []
+  StrengthBonus: 8
+  EnduranceBonus: 0
+  VitalityBonus: 0
+  InteligenceBonus: 0
+  SpeedBonus: 0
+  isStackable: 0
+  EquipmentType: 5

Assets/Resources/Items/BleedingSword.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2f8335046aa0e9e4f860fb08bad905f7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Items/BleedingSword.prefab

@@ -0,0 +1,84 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5830507499881365574
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1256896014575454821}
+  - component: {fileID: 1461611796645424848}
+  m_Layer: 0
+  m_Name: BleedingSword
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1256896014575454821
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5830507499881365574}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 8.154862, y: -3.987011, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &1461611796645424848
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5830507499881365574}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  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: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 3
+  m_Sprite: {fileID: 7296131321258663700, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0

Assets/Resources/Items/BleedingSword.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 690a7b48bf05f774b9db15ce3565605c
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Items/GoldenSword.asset

@@ -16,7 +16,7 @@ MonoBehaviour:
   name: Golden Sword
   description: The most powerful sword ever made
   level: 0
-  value: 0
+  value: 1
   image: {fileID: -8999859454926596933, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
   itemModel: {fileID: 2790164493770909838, guid: 2559f5cba4d858f4580ccce3904a047b, type: 3}
   price: 100

Assets/Resources/Items/HeavySword.asset

@@ -24,7 +24,7 @@ MonoBehaviour:
   useEffect:
     m_PersistentCalls:
       m_Calls: []
-  StrengthBonus: 3
+  StrengthBonus: 5
   EnduranceBonus: 0
   VitalityBonus: 0
   InteligenceBonus: 0

Assets/Resources/Items/LightSword.asset

@@ -19,7 +19,7 @@ MonoBehaviour:
   value: 3
   image: {fileID: 1389849888674057003, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
   itemModel: {fileID: 3310224593960103282, guid: a4d5dfca7c95e0242a086b8920a0c550, type: 3}
-  price: 70
+  price: 90
   useEffect:
     m_PersistentCalls:
       m_Calls: []

Assets/Resources/Items/ScrollOfDarkness.prefab

@@ -97,7 +97,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   item: {fileID: 11400000, guid: e2b2ed01bfff8e0468e4ef5207b50a60, type: 2}
-  itemName: ScrollOfDarknes
+  itemName: ScrollOfDarkness
   triggered: 0
   isPicked: 0
   HandleIndexInScelenObjectList: 0

Assets/Resources/Items/SteelSword.asset

@@ -0,0 +1,32 @@
+%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: a0c176e87b3c91641897c23dc27e92a0, type: 3}
+  m_Name: SteelSword
+  m_EditorClassIdentifier: 
+  id: 0
+  name: Steel Sword
+  description: Normal, good, steel sword.
+  level: 0
+  value: 2
+  image: {fileID: -8646935460526470913, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
+  itemModel: {fileID: 6473326822370538339, guid: 700ef656e302434459e3634e8f232bfb, type: 3}
+  price: 60
+  useEffect:
+    m_PersistentCalls:
+      m_Calls: []
+  StrengthBonus: 2
+  EnduranceBonus: 0
+  VitalityBonus: 0
+  InteligenceBonus: 0
+  SpeedBonus: 0
+  isStackable: 0
+  EquipmentType: 5

Assets/Resources/Items/SteelSword.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4818460acc33d384caa8775818d962a2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Items/SteelSword.prefab

@@ -0,0 +1,84 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6473326822370538339
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4067852157387036804}
+  - component: {fileID: 7024767136754657114}
+  m_Layer: 0
+  m_Name: SteelSword
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4067852157387036804
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6473326822370538339}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 9.23964, y: -0.9865416, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &7024767136754657114
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6473326822370538339}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  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: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 3
+  m_Sprite: {fileID: -8646935460526470913, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0

Assets/Resources/Items/SteelSword.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 700ef656e302434459e3634e8f232bfb
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Items/WaterAmulet.asset

@@ -17,7 +17,7 @@ MonoBehaviour:
   description: This Amulet gives one the power of Water
   level: 0
   value: 0
-  image: {fileID: 0}
+  image: {fileID: 3056869423434569188, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
   itemModel: {fileID: 8077255044395745669, guid: 5746269b822b8754a8ac1a3a41ff324d, type: 3}
   price: 140
   useEffect:

Assets/Resources/ThePlayer.prefab

@@ -1,5 +1,233 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &423885028210511475
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9173863758522711589}
+  - component: {fileID: 4211298382669312826}
+  m_Layer: 0
+  m_Name: HitboxTop
+  m_TagString: HitboxTop
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &9173863758522711589
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 423885028210511475}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4869648843286970699}
+  m_RootOrder: 12
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!61 &4211298382669312826
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 423885028210511475}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0.0051983595, y: 0.12212765}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 1.0702298, y: 0.30428338}
+  m_EdgeRadius: 0
+--- !u!1 &1761904425027622464
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3778560314650139288}
+  - component: {fileID: 4819603247893641569}
+  m_Layer: 0
+  m_Name: HitboxRight
+  m_TagString: HitboxRight
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3778560314650139288
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1761904425027622464}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4869648843286970699}
+  m_RootOrder: 10
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!61 &4819603247893641569
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1761904425027622464}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0.4409957, y: -0.13071585}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 0.47530448, y: 0.7385683}
+  m_EdgeRadius: 0
+--- !u!1 &2818479165111338262
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3646218488721668322}
+  - component: {fileID: 8041811300091993493}
+  m_Layer: 0
+  m_Name: HitboxBottom
+  m_TagString: HitboxBottom
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3646218488721668322
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2818479165111338262}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4869648843286970699}
+  m_RootOrder: 13
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!61 &8041811300091993493
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2818479165111338262}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0.0087887645, y: -0.7627721}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 0.9194318, y: 0.52221394}
+  m_EdgeRadius: 0
+--- !u!1 &3569136761634649798
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2852148786045835601}
+  - component: {fileID: 6295017038926879695}
+  m_Layer: 0
+  m_Name: HitboxLeft
+  m_TagString: HitboxLeft
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2852148786045835601
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3569136761634649798}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4869648843286970699}
+  m_RootOrder: 11
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!61 &6295017038926879695
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3569136761634649798}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: -0.4409957, y: -0.13071585}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 0.47530448, y: 0.7385683}
+  m_EdgeRadius: 0
 --- !u!1 &4869648843286970700
 GameObject:
   m_ObjectHideFlags: 0
@@ -48,6 +276,10 @@ Transform:
   - {fileID: 4869648843392866317}
   - {fileID: 4869648844762232054}
   - {fileID: 4869648845042760662}
+  - {fileID: 3778560314650139288}
+  - {fileID: 2852148786045835601}
+  - {fileID: 9173863758522711589}
+  - {fileID: 3646218488721668322}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Scenes/Cementary.unity

@@ -93621,6 +93621,7 @@ MonoBehaviour:
     coords: {x: 0, y: 0, z: 0}
     nextMapName: Catacombs
     respawnCoords: {x: 0, y: -1, z: 0}
+  isEnabled: 1
 --- !u!50 &419250167
 Rigidbody2D:
   serializedVersion: 4
@@ -98218,6 +98219,7 @@ GameObject:
   - component: {fileID: 502298260}
   - component: {fileID: 502298262}
   - component: {fileID: 502298261}
+  - component: {fileID: 502298263}
   m_Layer: 0
   m_Name: Tombstone2
   m_TagString: Untagged
@@ -98237,7 +98239,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 525147508}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!60 &502298261
 PolygonCollider2D:
@@ -98321,6 +98323,28 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &502298263
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 502298259}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8d0c116465fe18f49addcc4e95a35f0c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  position: 
+  x: 0
+  y: 0
+  temp: {x: 0, y: 0, z: 0}
+  tombstone: tombstone7
+  goal: 
+  speed: 3
+  pos: 
+  m_ClipName: 
+  player: {fileID: 0}
 --- !u!1 &507712396
 GameObject:
   m_ObjectHideFlags: 0
@@ -99033,15 +99057,15 @@ Transform:
   m_LocalPosition: {x: 45.728523, y: 31.956318, z: -15.9235325}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 871165713}
   - {fileID: 1697296129}
   - {fileID: 1674707995}
-  - {fileID: 1300921221}
-  - {fileID: 680287735}
   - {fileID: 1830964921}
+  - {fileID: 871165713}
+  - {fileID: 1114630285}
   - {fileID: 502298260}
   - {fileID: 816566231}
-  - {fileID: 1114630285}
+  - {fileID: 1300921221}
+  - {fileID: 680287735}
   m_Father: {fileID: 0}
   m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -107285,6 +107309,7 @@ GameObject:
   - component: {fileID: 680287735}
   - component: {fileID: 680287737}
   - component: {fileID: 680287736}
+  - component: {fileID: 680287738}
   m_Layer: 0
   m_Name: Tombstone9
   m_TagString: Untagged
@@ -107304,7 +107329,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 525147508}
-  m_RootOrder: 4
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!60 &680287736
 PolygonCollider2D:
@@ -107388,6 +107413,28 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &680287738
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 680287734}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8d0c116465fe18f49addcc4e95a35f0c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  position: 
+  x: 0
+  y: 0
+  temp: {x: 0, y: 0, z: 0}
+  tombstone: tombstone5
+  goal: 
+  speed: 3
+  pos: 
+  m_ClipName: 
+  player: {fileID: 0}
 --- !u!1 &680989708
 GameObject:
   m_ObjectHideFlags: 0
@@ -116043,6 +116090,7 @@ GameObject:
   - component: {fileID: 816566231}
   - component: {fileID: 816566233}
   - component: {fileID: 816566232}
+  - component: {fileID: 816566234}
   m_Layer: 0
   m_Name: Tombstone4
   m_TagString: Untagged
@@ -116062,7 +116110,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 525147508}
-  m_RootOrder: 7
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!60 &816566232
 PolygonCollider2D:
@@ -116146,6 +116194,28 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &816566234
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 816566230}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8d0c116465fe18f49addcc4e95a35f0c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  position: 
+  x: 0
+  y: 0
+  temp: {x: 0, y: 0, z: 0}
+  tombstone: tombstone8
+  goal: 
+  speed: 3
+  pos: 
+  m_ClipName: 
+  player: {fileID: 0}
 --- !u!1 &816804117
 GameObject:
   m_ObjectHideFlags: 0
@@ -123067,6 +123137,10 @@ GameObject:
   - component: {fileID: 871165713}
   - component: {fileID: 871165715}
   - component: {fileID: 871165714}
+  - component: {fileID: 871165716}
+  - component: {fileID: 871165719}
+  - component: {fileID: 871165718}
+  - component: {fileID: 871165717}
   m_Layer: 0
   m_Name: Tombstone6
   m_TagString: Untagged
@@ -123086,7 +123160,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 525147508}
-  m_RootOrder: 0
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!60 &871165714
 PolygonCollider2D:
@@ -123170,6 +123244,82 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &871165716
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 871165712}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8d0c116465fe18f49addcc4e95a35f0c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  position: 
+  x: 0
+  y: 0
+  temp: {x: 0, y: 0, z: 0}
+  tombstone: tombstone1
+  goal: 
+  speed: 3
+  pos: 
+  m_ClipName: 
+  player: {fileID: 0}
+--- !u!58 &871165717
+CircleCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 871165712}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  serializedVersion: 2
+  m_Radius: 1
+--- !u!114 &871165718
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 871165712}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ce2c370efba4d2e43b409e7ec8429171, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  SpeakerName: 
+  languageDetector:
+    InstanceTemplates:
+    - Key: 0
+      Value: {fileID: 11400000, guid: d977b7245cf53d848908a2ebe402cdaa, type: 2}
+    - Key: 1
+      Value: {fileID: 11400000, guid: d977b7245cf53d848908a2ebe402cdaa, type: 2}
+  Dialogue: {fileID: 0}
+  EndactionEventList: []
+  keyToOpen: 101
+  CanBeOpened: 0
+  OpenInDefaultWay: 1
+--- !u!114 &871165719
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 871165712}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a13ccc76cd22a814287fc3a36a9cac71, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Name: 
+  State: 1
 --- !u!1 &872957318
 GameObject:
   m_ObjectHideFlags: 0
@@ -174647,6 +174797,10 @@ GameObject:
   - component: {fileID: 1114630285}
   - component: {fileID: 1114630287}
   - component: {fileID: 1114630286}
+  - component: {fileID: 1114630288}
+  - component: {fileID: 1114630291}
+  - component: {fileID: 1114630290}
+  - component: {fileID: 1114630289}
   m_Layer: 0
   m_Name: Tombstone8
   m_TagString: Untagged
@@ -174666,7 +174820,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 525147508}
-  m_RootOrder: 8
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!60 &1114630286
 PolygonCollider2D:
@@ -174750,6 +174904,82 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &1114630288
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1114630284}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8d0c116465fe18f49addcc4e95a35f0c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  position: 
+  x: 0
+  y: 0
+  temp: {x: 0, y: 0, z: 0}
+  tombstone: tombstone9
+  goal: 
+  speed: 3
+  pos: 
+  m_ClipName: 
+  player: {fileID: 0}
+--- !u!58 &1114630289
+CircleCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1114630284}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  serializedVersion: 2
+  m_Radius: 1
+--- !u!114 &1114630290
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1114630284}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ce2c370efba4d2e43b409e7ec8429171, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  SpeakerName: 
+  languageDetector:
+    InstanceTemplates:
+    - Key: 0
+      Value: {fileID: 11400000, guid: f6cee7d6b05d61f4fb5e8f29ae4cda4d, type: 2}
+    - Key: 1
+      Value: {fileID: 11400000, guid: f6cee7d6b05d61f4fb5e8f29ae4cda4d, type: 2}
+  Dialogue: {fileID: 0}
+  EndactionEventList: []
+  keyToOpen: 101
+  CanBeOpened: 0
+  OpenInDefaultWay: 1
+--- !u!114 &1114630291
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1114630284}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a13ccc76cd22a814287fc3a36a9cac71, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Name: 
+  State: 1
 --- !u!1 &1116361021
 GameObject:
   m_ObjectHideFlags: 0
@@ -184816,6 +185046,7 @@ GameObject:
   - component: {fileID: 1300921221}
   - component: {fileID: 1300921223}
   - component: {fileID: 1300921222}
+  - component: {fileID: 1300921224}
   m_Layer: 0
   m_Name: Tombstone7
   m_TagString: Untagged
@@ -184835,7 +185066,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 525147508}
-  m_RootOrder: 3
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!60 &1300921222
 PolygonCollider2D:
@@ -184919,6 +185150,28 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &1300921224
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1300921220}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8d0c116465fe18f49addcc4e95a35f0c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  position: 
+  x: 0
+  y: 0
+  temp: {x: 0, y: 0, z: 0}
+  tombstone: tombstone4
+  goal: 
+  speed: 3
+  pos: 
+  m_ClipName: 
+  player: {fileID: 0}
 --- !u!1 &1301056682
 GameObject:
   m_ObjectHideFlags: 0
@@ -186906,6 +187159,7 @@ MonoBehaviour:
   SoundsPanel: {fileID: 1055265283}
   ControlsPanel: {fileID: 1955846637}
   LanguagePanel: {fileID: 966808735}
+  keyToSettings: 0
 --- !u!4 &1354066870
 Transform:
   m_ObjectHideFlags: 0
@@ -199541,6 +199795,7 @@ MonoBehaviour:
     coords: {x: 0, y: 0, z: 0}
     nextMapName: FirstVillage
     respawnCoords: {x: 108, y: 9, z: 0}
+  isEnabled: 1
 --- !u!50 &1600770607
 Rigidbody2D:
   serializedVersion: 4
@@ -203707,6 +203962,10 @@ GameObject:
   - component: {fileID: 1674707995}
   - component: {fileID: 1674707997}
   - component: {fileID: 1674707996}
+  - component: {fileID: 1674707998}
+  - component: {fileID: 1674708001}
+  - component: {fileID: 1674708000}
+  - component: {fileID: 1674707999}
   m_Layer: 0
   m_Name: Tombstone3
   m_TagString: Untagged
@@ -203726,7 +203985,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 525147508}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!60 &1674707996
 PolygonCollider2D:
@@ -203810,6 +204069,82 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &1674707998
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1674707994}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8d0c116465fe18f49addcc4e95a35f0c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  position: 
+  x: 0
+  y: 0
+  temp: {x: 0, y: 0, z: 0}
+  tombstone: tombstone3
+  goal: 
+  speed: 3
+  pos: 
+  m_ClipName: 
+  player: {fileID: 0}
+--- !u!58 &1674707999
+CircleCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1674707994}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  serializedVersion: 2
+  m_Radius: 1
+--- !u!114 &1674708000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1674707994}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ce2c370efba4d2e43b409e7ec8429171, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  SpeakerName: 
+  languageDetector:
+    InstanceTemplates:
+    - Key: 0
+      Value: {fileID: 11400000, guid: 2d828ff9b6679bf4ba037901c3cbf006, type: 2}
+    - Key: 1
+      Value: {fileID: 11400000, guid: 2d828ff9b6679bf4ba037901c3cbf006, type: 2}
+  Dialogue: {fileID: 0}
+  EndactionEventList: []
+  keyToOpen: 101
+  CanBeOpened: 0
+  OpenInDefaultWay: 1
+--- !u!114 &1674708001
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1674707994}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a13ccc76cd22a814287fc3a36a9cac71, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Name: 
+  State: 1
 --- !u!1 &1675211851
 GameObject:
   m_ObjectHideFlags: 0
@@ -204855,6 +205190,10 @@ GameObject:
   - component: {fileID: 1697296129}
   - component: {fileID: 1697296131}
   - component: {fileID: 1697296130}
+  - component: {fileID: 1697296132}
+  - component: {fileID: 1697296135}
+  - component: {fileID: 1697296134}
+  - component: {fileID: 1697296133}
   m_Layer: 0
   m_Name: Tombstone1
   m_TagString: Untagged
@@ -204874,7 +205213,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 525147508}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!60 &1697296130
 PolygonCollider2D:
@@ -204958,6 +205297,82 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &1697296132
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1697296128}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8d0c116465fe18f49addcc4e95a35f0c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  position: 
+  x: 0
+  y: 0
+  temp: {x: 0, y: 0, z: 0}
+  tombstone: tombstone2
+  goal: 
+  speed: 3
+  pos: 
+  m_ClipName: 
+  player: {fileID: 0}
+--- !u!58 &1697296133
+CircleCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1697296128}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  serializedVersion: 2
+  m_Radius: 1
+--- !u!114 &1697296134
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1697296128}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ce2c370efba4d2e43b409e7ec8429171, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  SpeakerName: 
+  languageDetector:
+    InstanceTemplates:
+    - Key: 0
+      Value: {fileID: 11400000, guid: 92f52c87256e3b04a98c17bf10e32c0a, type: 2}
+    - Key: 1
+      Value: {fileID: 11400000, guid: 92f52c87256e3b04a98c17bf10e32c0a, type: 2}
+  Dialogue: {fileID: 0}
+  EndactionEventList: []
+  keyToOpen: 101
+  CanBeOpened: 0
+  OpenInDefaultWay: 1
+--- !u!114 &1697296135
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1697296128}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a13ccc76cd22a814287fc3a36a9cac71, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Name: 
+  State: 1
 --- !u!1 &1697750591
 GameObject:
   m_ObjectHideFlags: 0
@@ -211851,6 +212266,10 @@ GameObject:
   - component: {fileID: 1830964921}
   - component: {fileID: 1830964923}
   - component: {fileID: 1830964922}
+  - component: {fileID: 1830964924}
+  - component: {fileID: 1830964927}
+  - component: {fileID: 1830964926}
+  - component: {fileID: 1830964925}
   m_Layer: 0
   m_Name: Tombstone5
   m_TagString: Untagged
@@ -211870,7 +212289,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 525147508}
-  m_RootOrder: 5
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!60 &1830964922
 PolygonCollider2D:
@@ -211954,6 +212373,82 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &1830964924
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1830964920}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8d0c116465fe18f49addcc4e95a35f0c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  position: 
+  x: 0
+  y: 0
+  temp: {x: 0, y: 0, z: 0}
+  tombstone: tombstone6
+  goal: 
+  speed: 3
+  pos: 
+  m_ClipName: 
+  player: {fileID: 0}
+--- !u!58 &1830964925
+CircleCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1830964920}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  serializedVersion: 2
+  m_Radius: 1
+--- !u!114 &1830964926
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1830964920}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ce2c370efba4d2e43b409e7ec8429171, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  SpeakerName: 
+  languageDetector:
+    InstanceTemplates:
+    - Key: 0
+      Value: {fileID: 11400000, guid: f6f2f4394e1b4bd40bb8de25fac202e3, type: 2}
+    - Key: 1
+      Value: {fileID: 11400000, guid: f6f2f4394e1b4bd40bb8de25fac202e3, type: 2}
+  Dialogue: {fileID: 0}
+  EndactionEventList: []
+  keyToOpen: 101
+  CanBeOpened: 0
+  OpenInDefaultWay: 1
+--- !u!114 &1830964927
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1830964920}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a13ccc76cd22a814287fc3a36a9cac71, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Name: 
+  State: 1
 --- !u!1 &1831693205
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/FirstVillage.unity

@@ -259986,19 +259986,23 @@ MonoBehaviour:
   shopModel:
     Content:
     - Key: 20
-      Value: {fileID: 11400000, guid: 56c5c2b6450ca9e44bae4cf253354d38, type: 2}
+      Value: {fileID: 11400000, guid: e76017225f130f3459860a42d4169494, type: 2}
     - Key: 1
       Value: {fileID: 11400000, guid: 4f8478425616c404f99961d36941d30c, type: 2}
-    - Key: 16
+    - Key: 6
       Value: {fileID: 11400000, guid: 43fcc69d78c8c3847bbedde817f35b45, type: 2}
     - Key: 3
       Value: {fileID: 11400000, guid: 414cc7af49ae5914a95e2c334a55af99, type: 2}
     - Key: 10
-      Value: {fileID: 11400000, guid: 54f1e69d5ede2d74eb4f3f95cdb7e20a, type: 2}
+      Value: {fileID: 11400000, guid: 56c5c2b6450ca9e44bae4cf253354d38, type: 2}
     - Key: 5
       Value: {fileID: 11400000, guid: c96390ceb0786494db5919aaad6a06be, type: 2}
     - Key: 13
       Value: {fileID: 11400000, guid: 5e28ddfc23a61b842bb3007b766d1649, type: 2}
+    - Key: 23
+      Value: {fileID: 11400000, guid: 74bb221206536b94caf425820b9d626d, type: 2}
+    - Key: 28
+      Value: {fileID: 11400000, guid: aa2aa2f5d3647d5468c0323e288324f5, type: 2}
 --- !u!114 &593922350
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -611232,11 +611236,11 @@ MonoBehaviour:
   Dialogue: {fileID: 0}
   EndactionEventList: []
   keyToOpen: 101
-  CanBeOpened: 1
+  CanBeOpened: 0
-  OpenInDefaultWay: 1
+  OpenInDefaultWay: 0
   MissionTemplate: {fileID: 11400000, guid: eb3bbf628b0534844b19c488ea4b9843, type: 2}
   Mission: {fileID: 11400000, guid: eb3bbf628b0534844b19c488ea4b9843, type: 2}
-  OpenMissionInDefaultWay: 1
+  OpenMissionInDefaultWay: 0
   FreeDialogue:
     Header: 
     WasDisplayed: 0
@@ -611256,8 +611260,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a13ccc76cd22a814287fc3a36a9cac71, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: Archibald
+  Name: 
-  State: 1
+  State: 4
 --- !u!1 &2002123028
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/InnVillage.unity

@@ -1605,7 +1605,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &228588812
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3544,6 +3544,12 @@ MonoBehaviour:
       Value: {fileID: 11400000, guid: 5cc7ba6926eaba9458a2713287847799, type: 2}
     - Key: 4
       Value: {fileID: 11400000, guid: 5ca5ea8918f15904c8bad3fe9694e5a5, type: 2}
+    - Key: 7
+      Value: {fileID: 11400000, guid: 5ca5ea8918f15904c8bad3fe9694e5a5, type: 2}
+    - Key: 17
+      Value: {fileID: 11400000, guid: b366ff81d4bcf0d4f9633bbbf7ea17df, type: 2}
+    - Key: 21
+      Value: {fileID: 11400000, guid: 5018db07efd330846ab41d3ed70a3c08, type: 2}
 --- !u!114 &445768719
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -20986,6 +20992,7 @@ MonoBehaviour:
   SoundsPanel: {fileID: 1820105106}
   ControlsPanel: {fileID: 630262873}
   LanguagePanel: {fileID: 1608355680}
+  keyToSettings: 0
 --- !u!4 &831536787
 Transform:
   m_ObjectHideFlags: 0
@@ -26358,6 +26365,7 @@ MonoBehaviour:
     coords: {x: 0, y: 0, z: 0}
     nextMapName: FirstVillage
     respawnCoords: {x: 66.5, y: 11, z: 0}
+  isEnabled: 1
 --- !u!50 &1509181477
 Rigidbody2D:
   serializedVersion: 4

Assets/Scenes/OutsideWizardsHouse.unity

@@ -10493,6 +10493,7 @@ MonoBehaviour:
     coords: {x: 0, y: 0, z: 0}
     nextMapName: FirstVillage
     respawnCoords: {x: -6, y: -2.5, z: 0}
+  isEnabled: 1
 --- !u!50 &92294486
 Rigidbody2D:
   serializedVersion: 4
@@ -785494,6 +785495,7 @@ GameObject:
   - component: {fileID: 1675160274}
   - component: {fileID: 1675160273}
   - component: {fileID: 1675160275}
+  - component: {fileID: 1675160276}
   m_Layer: 0
   m_Name: DoorGateway
   m_TagString: AnimatedDoorSceneTransition
@@ -785532,6 +785534,7 @@ MonoBehaviour:
     coords: {x: 0, y: 0, z: 0}
     nextMapName: WizardHouse
     respawnCoords: {x: 3.5, y: -13.5, z: 0}
+  isEnabled: 1
 --- !u!50 &1675160269
 Rigidbody2D:
   serializedVersion: 4
@@ -785700,6 +785703,19 @@ MonoBehaviour:
     coords: {x: 0, y: 0, z: 0}
     nextMapName: WizardHouse
     respawnCoords: {x: 0, y: 0, z: 0}
+  isEnabled: 1
+--- !u!114 &1675160276
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1675160266}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a60d2bf69c4ccc40ae03b215fb36f23, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!4 &1676539860 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 3885155328586034008, guid: cb9f8e3562bc21946990964087ce388f, type: 3}
@@ -836245,6 +836261,7 @@ MonoBehaviour:
   SoundsPanel: {fileID: 1087096258}
   ControlsPanel: {fileID: 496060010}
   LanguagePanel: {fileID: 1557381315}
+  keyToSettings: 0
 --- !u!4 &1934872276
 Transform:
   m_ObjectHideFlags: 0

Assets/Scenes/WizardHouse.unity

@@ -28007,6 +28007,7 @@ MonoBehaviour:
   SoundsPanel: {fileID: 422014594}
   ControlsPanel: {fileID: 984746019}
   LanguagePanel: {fileID: 224657175}
+  keyToSettings: 0
 --- !u!4 &972772842
 Transform:
   m_ObjectHideFlags: 0
@@ -32539,6 +32540,7 @@ MonoBehaviour:
     coords: {x: 0, y: 0, z: 0}
     nextMapName: OutsideWizardsHouse
     respawnCoords: {x: 0.5, y: 1, z: 0}
+  isEnabled: 1
 --- !u!50 &1585128605
 Rigidbody2D:
   serializedVersion: 4
@@ -39429,6 +39431,63 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2109855382}
   m_CullTransparentMesh: 1
+--- !u!1001 &2115511153
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3372166038178475857, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
+      propertyPath: m_Name
+      value: ScrollOfDarkness
+      objectReference: {fileID: 0}
+    - target: {fileID: 6816388368617782066, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
+      propertyPath: m_RootOrder
+      value: 15
+      objectReference: {fileID: 0}
+    - target: {fileID: 6816388368617782066, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 2.6638236
+      objectReference: {fileID: 0}
+    - target: {fileID: 6816388368617782066, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -8.376754
+      objectReference: {fileID: 0}
+    - target: {fileID: 6816388368617782066, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6816388368617782066, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6816388368617782066, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6816388368617782066, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6816388368617782066, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6816388368617782066, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6816388368617782066, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6816388368617782066, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
 --- !u!1 &2116489012
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/AnimatedDoorBehaviour.cs

@@ -10,6 +10,8 @@ public class AnimatedDoorBehaviour : TriggerDoor
     [SerializeField]
     public Gateway gateway;
 
+    [SerializeField]
+    public bool isEnabled = true;
 
     Animator animator;
 

Assets/Scripts/ChangeScene.cs

@@ -62,7 +62,12 @@ public class ChangeScene : MonoBehaviour
     {
         if(collision.gameObject.tag == "SceneTransition")
         {
-            if(!collision.gameObject.GetComponent<DoorBehaviour>().isEnabled)
+            if(collision.gameObject.GetComponent<DoorBehaviour>() != null && !collision.gameObject.GetComponent<DoorBehaviour>().isEnabled)
+            {
+                Debug.Log("Door are not enabled");
+                return;
+            }
+            else if (collision.gameObject.GetComponent<AnimatedDoorBehaviour>() != null && !collision.gameObject.GetComponent<AnimatedDoorBehaviour>().isEnabled)
             {
                 Debug.Log("Door are not enabled");
                 return;

Assets/Scripts/Pathfinding/TileData/Sandstone_Labirynth.asset

@@ -0,0 +1,17 @@
+%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: 9890013e3eb0ea54b90ab8d093688ac6, type: 3}
+  m_Name: Sandstone_Labirynth
+  m_EditorClassIdentifier: 
+  Tiles:
+  - {fileID: 11400000, guid: 405db7d55f3264a46b59a41d71c79bbf, type: 2}
+  walkable: 1

Assets/Scripts/Pathfinding/TileData/Sandstone_Labirynth.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c6db0f0f8f858004ca494a83a768432e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/REFACTORING/Story/WizardHouse/DoorBlocking.cs

@@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class DoorBlocking : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        if (InventoryUIManager.Instance.FindItemInWarehouseByName("ScrollOfDarkness").Count > 0)
+        {
+            Debug.Log("xd");
+            if (gameObject.GetComponent<DoorBehaviour>())
+                gameObject.GetComponent<DoorBehaviour>().isEnabled = false;
+            else if (gameObject.GetComponent<AnimatedDoorBehaviour>())
+                gameObject.GetComponent<AnimatedDoorBehaviour>().isEnabled = false;
+        }
+
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Assets/Scripts/REFACTORING/Story/WizardHouse/DoorBlocking.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8a60d2bf69c4ccc40ae03b215fb36f23
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/EditorBuildSettings.asset

@@ -62,4 +62,7 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/Pathway.unity
     guid: 4d2d2581a36c34345a65bb6b87de5077
+  - enabled: 1
+    path: Assets/Scenes/Dungeon.unity
+    guid: b6120123e7d93d84491a51c1d12dc291
   m_configObjects: {}

Scriptum.sln

@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{e0f48af5-6d3e-b154-523d-8f755dc8e665}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{7cc02776-5953-02f0-1d58-e2f51d95c564}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{7627C07C-5359-F002-1D58-E2F51D95C564}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,14 +11,14 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{e0f48af5-6d3e-b154-523d-8f755dc8e665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{e0f48af5-6d3e-b154-523d-8f755dc8e665}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{e0f48af5-6d3e-b154-523d-8f755dc8e665}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{e0f48af5-6d3e-b154-523d-8f755dc8e665}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7cc02776-5953-02f0-1d58-e2f51d95c564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7627C07C-5359-F002-1D58-E2F51D95C564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7cc02776-5953-02f0-1d58-e2f51d95c564}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7627C07C-5359-F002-1D58-E2F51D95C564}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7cc02776-5953-02f0-1d58-e2f51d95c564}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7627C07C-5359-F002-1D58-E2F51D95C564}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7cc02776-5953-02f0-1d58-e2f51d95c564}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7627C07C-5359-F002-1D58-E2F51D95C564}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

UserSettings/EditorUserSettings.asset

@@ -6,34 +6,34 @@ EditorUserSettings:
   serializedVersion: 4
   m_ConfigSettings:
     RecentlyUsedScenePath-0:
-      value: 22424703114646680e0b0227036c791904040c1c25242a312a2c5326ece92021
+      value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021
       flags: 0
     RecentlyUsedScenePath-1:
-      value: 22424703114646680e0b0227036c761e1821112620292135633c133af6f9
+      value: 22424703114646680e0b0227036c6f11021f0f2b3566333e243d04
       flags: 0
     RecentlyUsedScenePath-2:
       value: 22424703114646680e0b0227036c791f04120b3e1b293f7e38271427fb
       flags: 0
     RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036c791904040c062d2a2f223427093bc1e1223dacf238e0f323
+      value: 22424703114646680e0b0227036c761e1821112620292135633c133af6f9
       flags: 0
     RecentlyUsedScenePath-4:
-      value: 22424703114646680e0b0227036c6c151518162e002924393f301327eac3352ee7a923e7ee2e26
+      value: 22424703114646680e0b0227036c791904040c1c25242a312a2c5326ece92021
       flags: 0
     RecentlyUsedScenePath-5:
-      value: 22424703114646680e0b0227036c70050204112e291f2f2a2c3b1920caef212be7a923e7ee2e26
+      value: 22424703114646680e0b0227036c7b0518101d252266333e243d04
       flags: 0
     RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036c71150130192729686b700e261335ebf23939f6ee39e7a92f31352d1b
+      value: 22424703114646680e0b0227036c6c151518162e002924393f301327eac3352ee7a923e7ee2e26
       flags: 0
     RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb
+      value: 22424703114646680e0b0227036c68190c160a2e042733232867083debf42d
       flags: 0
     RecentlyUsedScenePath-8:
-      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
+      value: 22424703114646680e0b0227036c70050204112e291f2f2a2c3b1920caef212be7a923e7ee2e26
       flags: 0
     RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021
+      value: 22424703114646680e0b0227036c7c151b12163e2d3a3f7e38271427fb
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650