Version 1.6

JKAnderson · Sep 12, 2018 · 952bee6 · 952bee6
1 parent 19aae93
commit 952bee6
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 55 deletions.
diff --git a/DSR-Gadget/DSR-Gadget.csproj b/DSR-Gadget/DSR-Gadget.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\SourceLink.Create.GitHub.2.8.0\build\SourceLink.Create.GitHub.props" Condition="Exists('..\packages\SourceLink.Create.GitHub.2.8.0\build\SourceLink.Create.GitHub.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -46,8 +45,8 @@
     <Reference Include="LowLevelHooking, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\LowLevelHooking.1.0.1\lib\net20\LowLevelHooking.dll</HintPath>
     </Reference>
-    <Reference Include="Octokit, Version=0.30.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Octokit.0.30.0\lib\net45\Octokit.dll</HintPath>
+    <Reference Include="Octokit, Version=0.32.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Octokit.0.32.0\lib\net45\Octokit.dll</HintPath>
     </Reference>
     <Reference Include="Semver, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Semver.2.0.4\lib\net452\Semver.dll</HintPath>
@@ -182,12 +181,9 @@ if "$(ConfigurationName)" == "Release" (
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-	<Error Condition="!Exists('..\packages\SourceLink.Create.GitHub.2.8.0\build\SourceLink.Create.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SourceLink.Create.GitHub.2.8.0\build\SourceLink.Create.GitHub.props'))" />
-    <Error Condition="!Exists('..\packages\SourceLink.Create.GitHub.2.8.0\build\SourceLink.Create.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SourceLink.Create.GitHub.2.8.0\build\SourceLink.Create.GitHub.targets'))" />
     <Error Condition="!Exists('..\packages\Fody.3.1.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.1.3\build\Fody.targets'))" />
     <Error Condition="!Exists('..\packages\Costura.Fody.3.1.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.3.1.0\build\Costura.Fody.targets'))" />
-  </Target>  
-  <Import Project="..\packages\SourceLink.Create.GitHub.2.8.0\build\SourceLink.Create.GitHub.targets" Condition="Exists('..\packages\SourceLink.Create.GitHub.2.8.0\build\SourceLink.Create.GitHub.targets')" />
+  </Target>
   <Import Project="..\packages\Fody.3.1.3\build\Fody.targets" Condition="Exists('..\packages\Fody.3.1.3\build\Fody.targets')" />
   <Import Project="..\packages\Costura.Fody.3.1.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.3.1.0\build\Costura.Fody.targets')" />
 </Project>
diff --git a/DSR-Gadget/FormMain Tabs/Cheats.cs b/DSR-Gadget/FormMain Tabs/Cheats.cs
@@ -111,8 +111,7 @@ private void cbxPlayerDeadMode_CheckedChanged(object sender, EventArgs e)
 
         private void cbxPlayerNoDead_CheckedChanged(object sender, EventArgs e)
         {
-            if (loaded)
-                dsrProcess.SetPlayerNoDead(cbxPlayerNoDead.Checked);
+            dsrProcess.SetPlayerNoDead(cbxPlayerNoDead.Checked);
         }
 
         private void cbxPlayerDisableDamage_CheckedChanged(object sender, EventArgs e)
@@ -129,8 +128,7 @@ private void cbxPlayerNoHit_CheckedChanged(object sender, EventArgs e)
 
         private void cbxPlayerNoStamina_CheckedChanged(object sender, EventArgs e)
         {
-            if (loaded)
-                dsrProcess.SetPlayerNoStamina(cbxPlayerNoStamina.Checked);
+            dsrProcess.SetPlayerNoStamina(cbxPlayerNoStamina.Checked);
         }
 
         private void cbxPlayerSuperArmor_CheckedChanged(object sender, EventArgs e)
@@ -141,20 +139,17 @@ private void cbxPlayerSuperArmor_CheckedChanged(object sender, EventArgs e)
 
         private void cbxPlayerHide_CheckedChanged(object sender, EventArgs e)
         {
-            if (loaded)
-                dsrProcess.SetPlayerHide(cbxPlayerHide.Checked);
+            dsrProcess.SetPlayerHide(cbxPlayerHide.Checked);
         }
 
         private void cbxPlayerSilence_CheckedChanged(object sender, EventArgs e)
         {
-            if (loaded)
-                dsrProcess.SetPlayerSilence(cbxPlayerSilence.Checked);
+            dsrProcess.SetPlayerSilence(cbxPlayerSilence.Checked);
         }
 
         private void cbxPlayerExterminate_CheckedChanged(object sender, EventArgs e)
         {
-            if (loaded)
-                dsrProcess.SetPlayerExterminate(cbxPlayerExterminate.Checked);
+            dsrProcess.SetPlayerExterminate(cbxPlayerExterminate.Checked);
         }
 
         private void cbxPlayerNoGoods_CheckedChanged(object sender, EventArgs e)
@@ -165,56 +160,47 @@ private void cbxPlayerNoGoods_CheckedChanged(object sender, EventArgs e)
 
         private void cbxAllNoArrow_CheckedChanged(object sender, EventArgs e)
         {
-            if (loaded)
-                dsrProcess.SetAllNoArrow(cbxAllNoArrow.Checked);
+            dsrProcess.SetAllNoArrow(cbxAllNoArrow.Checked);
         }
 
         private void cbxAllNoMagicQty_CheckedChanged(object sender, EventArgs e)
         {
-            if (loaded)
-                dsrProcess.SetAllNoMagicQty(cbxAllNoMagicQty.Checked);
+            dsrProcess.SetAllNoMagicQty(cbxAllNoMagicQty.Checked);
         }
 
         private void cbxAllNoDead_CheckedChanged(object sender, EventArgs e)
         {
-            if (loaded)
-                dsrProcess.SetAllNoDead(cbxAllNoDead.Checked);
+            dsrProcess.SetAllNoDead(cbxAllNoDead.Checked);
         }
 
         private void cbxAllNoDamage_CheckedChanged(object sender, EventArgs e)
         {
-            if (loaded)
-                dsrProcess.SetAllNoDamage(cbxAllNoDamage.Checked);
+            dsrProcess.SetAllNoDamage(cbxAllNoDamage.Checked);
         }
 
         private void cbxAllNoHit_CheckedChanged(object sender, EventArgs e)
         {
-            if (loaded)
-                dsrProcess.SetAllNoHit(cbxAllNoHit.Checked);
+            dsrProcess.SetAllNoHit(cbxAllNoHit.Checked);
         }
 
         private void cbxAllNoStamina_CheckedChanged(object sender, EventArgs e)
         {
-            if (loaded)
-                dsrProcess.SetAllNoStamina(cbxAllNoStamina.Checked);
+            dsrProcess.SetAllNoStamina(cbxAllNoStamina.Checked);
         }
 
         private void cbxAllNoAttack_CheckedChanged(object sender, EventArgs e)
         {
-            if (loaded)
-                dsrProcess.SetAllNoAttack(cbxAllNoAttack.Checked);
+            dsrProcess.SetAllNoAttack(cbxAllNoAttack.Checked);
         }
 
         private void cbxAllNoMove_CheckedChanged(object sender, EventArgs e)
         {
-            if (loaded)
-                dsrProcess.SetAllNoMove(cbxAllNoMove.Checked);
+            dsrProcess.SetAllNoMove(cbxAllNoMove.Checked);
         }
 
         private void cbxAllNoUpdateAI_CheckedChanged(object sender, EventArgs e)
         {
-            if (loaded)
-                dsrProcess.SetAllNoUpdateAI(cbxAllNoUpdateAI.Checked);
+            dsrProcess.SetAllNoUpdateAI(cbxAllNoUpdateAI.Checked);
         }
     }
 }
diff --git a/DSR-Gadget/FormMain Tabs/Graphics.cs b/DSR-Gadget/FormMain Tabs/Graphics.cs
@@ -50,7 +50,7 @@ private void resetGraphics()
             if (!cbxDrawCutscenes.Checked)
                 dsrProcess.SetDrawCutscenes(true);
 
-            if (cbxFilter.Checked)
+            if (loaded && cbxFilter.Checked)
                 dsrProcess.SetFilterOverride(false);
         }
 
@@ -78,32 +78,27 @@ private void updateGraphics() { }
 
         private void cbxDrawMap_CheckedChanged(object sender, EventArgs e)
         {
-            if (loaded)
-                dsrProcess.SetDrawMap(cbxDrawMap.Checked);
+            dsrProcess.SetDrawMap(cbxDrawMap.Checked);
         }
 
         private void cbxDrawObjects_CheckedChanged(object sender, EventArgs e)
         {
-            if (loaded)
-                dsrProcess.SetDrawObjects(cbxDrawObjects.Checked);
+            dsrProcess.SetDrawObjects(cbxDrawObjects.Checked);
         }
 
         private void cbxDrawCharacters_CheckedChanged(object sender, EventArgs e)
         {
-            if (loaded)
-                dsrProcess.SetDrawCharacters(cbxDrawCharacters.Checked);
+            dsrProcess.SetDrawCharacters(cbxDrawCharacters.Checked);
         }
 
         private void cbxDrawSFX_CheckedChanged(object sender, EventArgs e)
         {
-            if (loaded)
-                dsrProcess.SetDrawSFX(cbxDrawSFX.Checked);
+            dsrProcess.SetDrawSFX(cbxDrawSFX.Checked);
         }
 
         private void cbxDrawCutscenes_CheckedChanged(object sender, EventArgs e)
         {
-            if (loaded)
-                dsrProcess.SetDrawCutscenes(cbxDrawCutscenes.Checked);
+            dsrProcess.SetDrawCutscenes(cbxDrawCutscenes.Checked);
         }
 
         private void cbxFilter_CheckedChanged(object sender, EventArgs e)

diff --git a/DSR-Gadget/FormMain Tabs/Player.cs b/DSR-Gadget/FormMain Tabs/Player.cs
@@ -48,9 +48,9 @@ private void resetPlayer()
         private void reloadPlayer()
         {
             if (!cbxGravity.Checked)
-                dsrProcess.SetNoGravity(false);
+                dsrProcess.SetNoGravity(true);
             if (!cbxCollision.Checked)
-                dsrProcess.SetNoCollision(false);
+                dsrProcess.SetNoCollision(true);
         }
 
         private void updatePlayer()

diff --git a/DSR-Gadget/FormMain.cs b/DSR-Gadget/FormMain.cs
@@ -113,9 +113,9 @@ private void tmrUpdate_Tick(object sender, EventArgs e)
                         {
                             lblLoadedValue.Text = "Yes";
                             dsrProcess.LoadPointers();
+                            loaded = true;
                             reloadAll();
                             enableCriticalControls(true);
-                            loaded = true;
                         }
                         else
                         {

diff --git a/DSR-Gadget/Properties/AssemblyInfo.cs b/DSR-Gadget/Properties/AssemblyInfo.cs
@@ -36,5 +36,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6")]
diff --git a/DSR-Gadget/packages.config b/DSR-Gadget/packages.config
@@ -3,7 +3,6 @@
   <package id="Costura.Fody" version="3.1.0" targetFramework="net471" />
   <package id="Fody" version="3.1.3" targetFramework="net471" developmentDependency="true" />
   <package id="LowLevelHooking" version="1.0.1" targetFramework="net471" />
-  <package id="Octokit" version="0.30.0" targetFramework="net471" />
+  <package id="Octokit" version="0.32.0" targetFramework="net472" />
   <package id="Semver" version="2.0.4" targetFramework="net471" />
-  <package id="SourceLink.Create.GitHub" version="2.8.0" targetFramework="net471" />
 </packages>
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 
-# DSR Gadget - By Pav & TKGP
+# DSR Gadget 1.6 - By Pav & TKGP
 A multi-purpose testing tool for Dark Souls: Remastered.  
 Compatible with DSR App ver. 1.01, 1.01.1, 1.01.2, 1.03, and possibly future versions.  
 Requires [.NET 4.7.2](https://www.microsoft.com/net/download/thank-you/net472) - Windows 10 users should already have this.
@@ -17,6 +17,10 @@ Requires [.NET 4.7.2](https://www.microsoft.com/net/download/thank-you/net472) -
 [Semver](https://github.com/maxhauser/semver) by Max Hauser
 
 # Changelog
+### 1.6
+* Fixed cheats and other things staying on if you unchecked them while unloaded
+* Fixed no gravity, no collision, and filters not reapplying properly after reloads
+
 ### 1.5
 * Supports 1.03
 * Controls that don't need the game to be loaded can now be used without the game being loaded

diff --git a/readme.txt b/readme.txt
@@ -1,5 +1,5 @@
 
---| DSR Gadget 1.5
+--| DSR Gadget 1.6
 --| By Pav & TKGP
 --| https://github.com/JKAnderson/DSR-Gadget
 
@@ -31,6 +31,10 @@ https://github.com/maxhauser/semver
 
 --| Changelog
 
+1.6
+	Fixed cheats and other things staying on if you unchecked them while unloaded
+	Fixed no gravity, no collision, and filters not reapplying properly after reloads
+
 1.5
 	Supports 1.03
 	Controls that don't need the game to be loaded can now be used without the game being loaded