Cursors

R2NorthstarTools · Jan 23, 2024 · 24905fa · 24905fa
1 parent a2c8914
commit 24905fa
Show file tree

Hide file tree

Showing 18 changed files with 13 additions and 9 deletions.
diff --git a/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.metadata.v7.bin b/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.metadata.v7.bin
diff --git a/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.projects.v7.bin b/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.projects.v7.bin
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/04f5124b-0229-496f-8bcb-9d8880905602.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/04f5124b-0229-496f-8bcb-9d8880905602.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/0b02963d-23c0-49b7-a9f8-bbb5d1649240.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/0b02963d-23c0-49b7-a9f8-bbb5d1649240.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/2ab6882b-e530-47f8-a0ed-7e5666790802.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/2ab6882b-e530-47f8-a0ed-7e5666790802.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/3ba74aa4-1f34-4681-ae6b-205ea625f65b.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/3ba74aa4-1f34-4681-ae6b-205ea625f65b.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/977517dd-1a74-4a57-925a-76ec0ccb9dc5.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/977517dd-1a74-4a57-925a-76ec0ccb9dc5.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/9f47aa0b-4364-441e-9eb6-8cd071645d7c.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/9f47aa0b-4364-441e-9eb6-8cd071645d7c.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/cd6ef953-912d-4fa5-a529-0a8dd1c0e81f.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/cd6ef953-912d-4fa5-a529-0a8dd1c0e81f.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/eb3f8514-6741-461c-8685-20766d686c79.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/eb3f8514-6741-461c-8685-20766d686c79.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/f0510f3e-5ad7-4fb3-8ee4-66e29d5c2fd8.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/f0510f3e-5ad7-4fb3-8ee4-66e29d5c2fd8.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/f82bd1c0-8baf-4bf2-b87c-526c8b8c9039.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/f82bd1c0-8baf-4bf2-b87c-526c8b8c9039.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/v17/.futdcache.v2 b/VTOL_2.0.0/.vs/VTOL/v17/.futdcache.v2
diff --git a/VTOL_2.0.0/.vs/VTOL/v17/fileList.bin b/VTOL_2.0.0/.vs/VTOL/v17/fileList.bin
diff --git a/VTOL_2.0.0/MainWindow.xaml.cs b/VTOL_2.0.0/MainWindow.xaml.cs
@@ -374,7 +374,7 @@ public MainWindow()
         Cursor LeadWall, Ronin;
         public void SwitchCursor(string cur)
         {
-            string CursorDir = Directory.GetParent(System.Reflection.Assembly.GetExecutingAssembly().Location.ToString()).FullName + @"\Resources\Resources_Static\Cursors\";
+            string CursorDir = Directory.GetParent(System.Reflection.Assembly.GetExecutingAssembly().Location.ToString()).FullName + @"\Resources\Cursors\";
             LeadWall = new Cursor(CursorDir + "Leadwallcur.cur");
             Ronin = new Cursor(CursorDir + "NormalCurTf2.cur");
             if(Ronin == null || LeadWall == null) {

diff --git a/...s/Resource_Static/Cursors/Leadwallcur.cur → VTOL_2.0.0/Resources/Cursors/Leadwallcur.cur b/...s/Resource_Static/Cursors/Leadwallcur.cur → VTOL_2.0.0/Resources/Cursors/Leadwallcur.cur
diff --git a/.../Resource_Static/Cursors/NormalCurTf2.cur → ..._2.0.0/Resources/Cursors/NormalCurTf2.cur b/.../Resource_Static/Cursors/NormalCurTf2.cur → ..._2.0.0/Resources/Cursors/NormalCurTf2.cur
diff --git a/VTOL_2.0.0/VTOL.csproj b/VTOL_2.0.0/VTOL.csproj
@@ -32,12 +32,16 @@
 
   <ItemGroup>
     <Compile Remove="LEGACY_NORTHSTAR_INSTALLER\**" />
+    <Compile Remove="Resources\Resource_Static\Cursors\**" />
     <Compile Remove="Version_1_VTOL_INSTALLER\**" />
     <EmbeddedResource Remove="LEGACY_NORTHSTAR_INSTALLER\**" />
+    <EmbeddedResource Remove="Resources\Resource_Static\Cursors\**" />
     <EmbeddedResource Remove="Version_1_VTOL_INSTALLER\**" />
     <None Remove="LEGACY_NORTHSTAR_INSTALLER\**" />
+    <None Remove="Resources\Resource_Static\Cursors\**" />
     <None Remove="Version_1_VTOL_INSTALLER\**" />
     <Page Remove="LEGACY_NORTHSTAR_INSTALLER\**" />
+    <Page Remove="Resources\Resource_Static\Cursors\**" />
     <Page Remove="Version_1_VTOL_INSTALLER\**" />
   </ItemGroup>
 
@@ -287,6 +291,8 @@
     <None Remove="Resources\Backgrounds\titanfall-2-screen.jpg" />
     <None Remove="Resources\Backgrounds\warning.png" />
     <None Remove="Resources\Backgrounds\_.jpg" />
+    <None Remove="Resources\Cursors\Leadwallcur.cur" />
+    <None Remove="Resources\Cursors\NormalCurTf2.cur" />
     <None Remove="Resources\Icons\EA.ico" />
     <None Remove="Resources\Icons\GitHub-Mark-32px.png" />
     <None Remove="Resources\Icons\GitHub-Mark-Light-32px.png" />
@@ -311,8 +317,6 @@
     <None Remove="Resources\Resource_Static\Advocate_banner.png" />
     <None Remove="Resources\Resource_Static\better_frog.png" />
     <None Remove="Resources\Resource_Static\Crowbar.png" />
-    <None Remove="Resources\Resource_Static\Cursors\Leadwallcur.cur" />
-    <None Remove="Resources\Resource_Static\Cursors\NormalCurTf2.cur" />
     <None Remove="Resources\Resource_Static\harmony.png" />
     <None Remove="Resources\Resource_Static\Leigon+.jpg" />
     <None Remove="Resources\Resource_Static\MDL_SHIT_Banner.png" />
@@ -778,6 +782,12 @@
     <Resource Include="Resources\Backgrounds\profiles_bg.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Resources\Cursors\Leadwallcur.cur">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Resources\Cursors\NormalCurTf2.cur">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
     <Resource Include="Resources\Icons\EA.ico">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
@@ -790,12 +800,6 @@
     <Resource Include="Resources\Resource_Static\better_frog.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
-    <Resource Include="Resources\Resource_Static\Cursors\Leadwallcur.cur">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Resources\Resource_Static\Cursors\NormalCurTf2.cur">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
     <Resource Include="Resources\Resource_Static\Leigon+.jpg">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>