Change defaults and allow the use of confirm on release for Fortnite …

…chapter 2
dpvdberg · Oct 15, 2019 · f30b992 · f30b992
1 parent 9393e45
commit f30b992
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 8 deletions.
diff --git a/FortEZEdit/App.config b/FortEZEdit/App.config
@@ -38,7 +38,7 @@
                 <value>1</value>
             </setting>
             <setting name="Key_EditRampPlaceModifier" serializeAs="String">
-                <value>Control</value>
+                <value>F</value>
             </setting>
             <setting name="FnKey_Ramp" serializeAs="String">
                 <value>C</value>
@@ -49,6 +49,9 @@
             <setting name="FnKey_Shotgun" serializeAs="String">
                 <value>Two</value>
             </setting>
+            <setting name="Check_EditToConfirm" serializeAs="String">
+                <value>True</value>
+            </setting>
         </FortEZEdit.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/FortEZEdit/FortEZEditForm.Designer.cs b/FortEZEdit/FortEZEditForm.Designer.cs
diff --git a/FortEZEdit/FortEZEditForm.cs b/FortEZEdit/FortEZEditForm.cs
@@ -89,6 +89,9 @@ private void LoadSettings()
                 btnFnKeyShotgun.Text = Properties.Settings.Default.FnKey_Shotgun.ToString();
                 settingsSetterMap[btnFnKeyShotgun] = (s) => { Properties.Settings.Default.FnKey_Shotgun = (Interceptor.Keys)s; };
 
+                chkEditToConfirm.Checked = Properties.Settings.Default.Check_EditToConfirm;
+                settingsSetterMap[chkEditToConfirm] = (s) => { Properties.Settings.Default.Check_EditToConfirm = (bool)s; };
+
                 numMouseId.Value = Properties.Settings.Default.id_Mouse;
                 settingsSetterMap[numMouseId] = (s) =>
                 {
@@ -173,7 +176,16 @@ private void changeNumEvent(object sender, EventArgs e)
                 settingsSetterMap[changingUpDown].Invoke(Convert.ToInt32(changingUpDown.Value));
                 LoadSettings();
             }
-            changingUpDown = null;
+        }
+
+        private void changeCheckEvent(object sender, EventArgs e)
+        {
+            CheckBox changingCheckBox = (CheckBox)sender;
+            if (settingsSetterMap.ContainsKey(changingCheckBox))
+            {
+                settingsSetterMap[changingCheckBox].Invoke(changingCheckBox.Checked);
+                LoadSettings();
+            }
         }
     }
 }
diff --git a/FortEZEdit/IntereceptorFacade.cs b/FortEZEdit/IntereceptorFacade.cs
@@ -139,13 +139,19 @@ private void Input_OnKeyPressed(object sender, KeyPressedEventArgs e)
                             // Spin wait
                         }
                         Thread.Sleep(defaultSettings.Delay_DnrClickRelease);
-                        input.SendKey(defaultSettings.FnKey_Edit);
+                        // Confirm the edit
+                        if (defaultSettings.Check_EditToConfirm)
+                        {
+                            input.SendKey(defaultSettings.FnKey_Edit);
+                        }
+                        // If ramp placement is triggered, build the ramp and select shotgun
                         if (triggeredEditRampPlace || isEditRampPlaceModifierDown)
                         {
                             input.SendKey(defaultSettings.FnKey_Ramp);
                             Thread.Sleep(defaultSettings.Delay_ReleaseEditRampPlaceDelay);
                             input.SendKey(defaultSettings.FnKey_Shotgun);
                         }
+                        // Release mouse
                         input.SendMouseEvent(MouseState.LeftUp);
                         isDnRDown = false;
                         triggeredEditRampPlace = false;

diff --git a/FortEZEdit/Properties/AssemblyInfo.cs b/FortEZEdit/Properties/AssemblyInfo.cs
@@ -32,5 +32,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.0.2.0")]
-[assembly: AssemblyFileVersion("1.0.2.0")]
+[assembly: AssemblyVersion("1.0.2.1")]
+[assembly: AssemblyFileVersion("1.0.2.1")]
diff --git a/FortEZEdit/Properties/Settings.Designer.cs b/FortEZEdit/Properties/Settings.Designer.cs
diff --git a/FortEZEdit/Properties/Settings.settings b/FortEZEdit/Properties/Settings.settings
@@ -30,7 +30,7 @@
       <Value Profile="(Default)">1</Value>
     </Setting>
     <Setting Name="Key_EditRampPlaceModifier" Type="Interceptor.Keys" Scope="User">
-      <Value Profile="(Default)">Control</Value>
+      <Value Profile="(Default)">F</Value>
     </Setting>
     <Setting Name="FnKey_Ramp" Type="Interceptor.Keys" Scope="User">
       <Value Profile="(Default)">C</Value>
@@ -41,5 +41,8 @@
     <Setting Name="FnKey_Shotgun" Type="Interceptor.Keys" Scope="User">
       <Value Profile="(Default)">Two</Value>
     </Setting>
+    <Setting Name="Check_EditToConfirm" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
 </SettingsFile>