Added moving tombstones

2023-01-11 13:53:27 +01:00 · 2023-01-11 13:53:27 +01:00 · 032689eeca
commit 032689eeca
parent 80df686805
8 changed files with 684 additions and 114 deletions
--- a/Assembly-CSharp-Editor.csproj
+++ b/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>
-    <_FullFrameworkReferenceAssemblyPaths>non_empty_path_generated_by_unity.rider.package</_FullFrameworkReferenceAssemblyPaths>
-    <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
-  <CodeAnalysisRuleSet></CodeAnalysisRuleSet>
+    <CscToolPath>C:\Program Files\Unity\Hub\Editor\2020.3.32f1\Editor\Data\Tools\RoslynScripts</CscToolPath>
+    <CscToolExe>unity_csc.bat</CscToolExe>
  </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>
-    <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectGuid>{7627C07C-5359-F002-1D58-E2F51D95C564}</ProjectGuid>
    <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" />
--- a/Assembly-CSharp.csproj
+++ b/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>
-    <_FullFrameworkReferenceAssemblyPaths>non_empty_path_generated_by_unity.rider.package</_FullFrameworkReferenceAssemblyPaths>
-    <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
-  <CodeAnalysisRuleSet></CodeAnalysisRuleSet>
+    <CscToolPath>C:\Program Files\Unity\Hub\Editor\2020.3.32f1\Editor\Data\Tools\RoslynScripts</CscToolPath>
+    <CscToolExe>unity_csc.bat</CscToolExe>
  </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>
-    <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectGuid>{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}</ProjectGuid>
    <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>
--- a/Assets/MoveTombstone.cs
+++ b/Assets/MoveTombstone.cs
@ -0,0 +1,143 @@
+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()
+    {
+        x = transform.position.x;
+        y = transform.position.y;
+        if (x == transform.position.x && y == transform.position.y)
+        {
+            PlayerPrefs.SetString(tombstone, "start");
+        }
+        player = GameObject.FindWithTag("Player");
+
+    }
+
+    // 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";
+                }
+            }
+        }
+    }
+
+
+
+}
--- a/Assets/MoveTombstone.cs.meta
+++ b/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: 
--- a/Assets/Resources/ThePlayer.prefab
+++ b/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}
--- a/Assets/Scenes/Cementary.unity
+++ b/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
@ -98321,6 +98323,26 @@ 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: 
 --- !u!1 &507712396
 GameObject:
  m_ObjectHideFlags: 0
@ -107285,6 +107307,7 @@ GameObject:
  - component: {fileID: 680287735}
  - component: {fileID: 680287737}
  - component: {fileID: 680287736}
+  - component: {fileID: 680287738}
  m_Layer: 0
  m_Name: Tombstone9
  m_TagString: Untagged
@ -107388,6 +107411,26 @@ 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: 
 --- !u!1 &680989708
 GameObject:
  m_ObjectHideFlags: 0
@ -116043,6 +116086,7 @@ GameObject:
  - component: {fileID: 816566231}
  - component: {fileID: 816566233}
  - component: {fileID: 816566232}
+  - component: {fileID: 816566234}
  m_Layer: 0
  m_Name: Tombstone4
  m_TagString: Untagged
@ -116146,6 +116190,26 @@ 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: 
 --- !u!1 &816804117
 GameObject:
  m_ObjectHideFlags: 0
@ -123067,6 +123131,7 @@ GameObject:
  - component: {fileID: 871165713}
  - component: {fileID: 871165715}
  - component: {fileID: 871165714}
+  - component: {fileID: 871165716}
  m_Layer: 0
  m_Name: Tombstone6
  m_TagString: Untagged
@ -123170,6 +123235,26 @@ 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: 
 --- !u!1 &872957318
 GameObject:
  m_ObjectHideFlags: 0
@ -174647,6 +174732,7 @@ GameObject:
  - component: {fileID: 1114630285}
  - component: {fileID: 1114630287}
  - component: {fileID: 1114630286}
+  - component: {fileID: 1114630288}
  m_Layer: 0
  m_Name: Tombstone8
  m_TagString: Untagged
@ -174750,6 +174836,26 @@ 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: 
 --- !u!1 &1116361021
 GameObject:
  m_ObjectHideFlags: 0
@ -184816,6 +184922,7 @@ GameObject:
  - component: {fileID: 1300921221}
  - component: {fileID: 1300921223}
  - component: {fileID: 1300921222}
+  - component: {fileID: 1300921224}
  m_Layer: 0
  m_Name: Tombstone7
  m_TagString: Untagged
@ -184919,6 +185026,26 @@ 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: 
 --- !u!1 &1301056682
 GameObject:
  m_ObjectHideFlags: 0
@ -186906,6 +187033,7 @@ MonoBehaviour:
  SoundsPanel: {fileID: 1055265283}
  ControlsPanel: {fileID: 1955846637}
  LanguagePanel: {fileID: 966808735}
+  keyToSettings: 0
 --- !u!4 &1354066870
 Transform:
  m_ObjectHideFlags: 0
@ -199541,6 +199669,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 +203836,7 @@ GameObject:
  - component: {fileID: 1674707995}
  - component: {fileID: 1674707997}
  - component: {fileID: 1674707996}
+  - component: {fileID: 1674707998}
  m_Layer: 0
  m_Name: Tombstone3
  m_TagString: Untagged
@ -203810,6 +203940,26 @@ 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: 
 --- !u!1 &1675211851
 GameObject:
  m_ObjectHideFlags: 0
@ -204855,6 +205005,7 @@ GameObject:
  - component: {fileID: 1697296129}
  - component: {fileID: 1697296131}
  - component: {fileID: 1697296130}
+  - component: {fileID: 1697296132}
  m_Layer: 0
  m_Name: Tombstone1
  m_TagString: Untagged
@ -204958,6 +205109,26 @@ 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: 
 --- !u!1 &1697750591
 GameObject:
  m_ObjectHideFlags: 0
@ -211851,6 +212022,7 @@ GameObject:
  - component: {fileID: 1830964921}
  - component: {fileID: 1830964923}
  - component: {fileID: 1830964922}
+  - component: {fileID: 1830964924}
  m_Layer: 0
  m_Name: Tombstone5
  m_TagString: Untagged
@ -211954,6 +212126,26 @@ 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: 
 --- !u!1 &1831693205
 GameObject:
  m_ObjectHideFlags: 0
--- a/Scriptum.sln
+++ b/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
-		{e0f48af5-6d3e-b154-523d-8f755dc8e665}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{e0f48af5-6d3e-b154-523d-8f755dc8e665}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{e0f48af5-6d3e-b154-523d-8f755dc8e665}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7cc02776-5953-02f0-1d58-e2f51d95c564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7cc02776-5953-02f0-1d58-e2f51d95c564}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7cc02776-5953-02f0-1d58-e2f51d95c564}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7cc02776-5953-02f0-1d58-e2f51d95c564}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F58AF4E0-3E6D-54B1-523D-8F755DC8E665}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7627C07C-5359-F002-1D58-E2F51D95C564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7627C07C-5359-F002-1D58-E2F51D95C564}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7627C07C-5359-F002-1D58-E2F51D95C564}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7627C07C-5359-F002-1D58-E2F51D95C564}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@ -6,35 +6,35 @@ EditorUserSettings:
  serializedVersion: 4
  m_ConfigSettings:
    RecentlyUsedScenePath-0:
-      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
-      flags: 0
-    RecentlyUsedScenePath-1:
      value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021
      flags: 0
-    RecentlyUsedScenePath-2:
+    RecentlyUsedScenePath-1:
      value: 22424703114646680e0b0227036c6f11021f0f2b3566333e243d04
      flags: 0
-    RecentlyUsedScenePath-3:
+    RecentlyUsedScenePath-2:
      value: 22424703114646680e0b0227036c791f04120b3e1b293f7e38271427fb
      flags: 0
-    RecentlyUsedScenePath-4:
+    RecentlyUsedScenePath-3:
      value: 22424703114646680e0b0227036c761e1821112620292135633c133af6f9
      flags: 0
-    RecentlyUsedScenePath-5:
+    RecentlyUsedScenePath-4:
      value: 22424703114646680e0b0227036c791904040c1c25242a312a2c5326ece92021
      flags: 0
-    RecentlyUsedScenePath-6:
+    RecentlyUsedScenePath-5:
      value: 22424703114646680e0b0227036c7b0518101d252266333e243d04
      flags: 0
-    RecentlyUsedScenePath-7:
+    RecentlyUsedScenePath-6:
      value: 22424703114646680e0b0227036c6c151518162e002924393f301327eac3352ee7a923e7ee2e26
      flags: 0
-    RecentlyUsedScenePath-8:
+    RecentlyUsedScenePath-7:
      value: 22424703114646680e0b0227036c68190c160a2e042733232867083debf42d
      flags: 0
-    RecentlyUsedScenePath-9:
+    RecentlyUsedScenePath-8:
      value: 22424703114646680e0b0227036c70050204112e291f2f2a2c3b1920caef212be7a923e7ee2e26
      flags: 0
+    RecentlyUsedScenePath-9:
+      value: 22424703114646680e0b0227036c7c151b12163e2d3a3f7e38271427fb
+      flags: 0
    vcSharedLogLevel:
      value: 0d5e400f0650
      flags: 0