Fixed logic to fix a bug with flags incorrectly being reset on quitouts

TIL, when you quitout, right before the game isn't loaded anymore, all the flags are being reset to their original values. Previous code assumed that wasn't possible and was thus resetting the state of the logic too early.

New code only reset states when the game is loaded.

Author: CapitaineToinon

Gadgetlemage/MainWindow.xaml.cs

@@ -95,20 +95,10 @@ private void AutoRefresh(CancellationToken ct)
                 {
                     btnCreate.IsEnabled = Model.Hooked && Model.Loaded;
 
-                    // Automatically creates the weapon if needed
-                    bool autoCreate = cbxAutoCreate.IsChecked ?? false;
-                    if (Model.Hooked && Model.Loaded && autoCreate)
-                    {
-                        Model.AutomaticallyCreateWeapon();
-                    }
-
-                    // Automatically delete the shield if needed
-                    bool autoDelete = cbxAutoDelete.IsChecked ?? false;
-                    if (Model.Hooked && Model.Loaded && autoDelete)
-                    {
-                        Model.AutomaticallyRemoveShield();
-                    }
+                    bool createWeapon = cbxAutoCreate.IsChecked ?? false;
+                    bool deleteShield = cbxAutoDelete.IsChecked ?? false;
 
+                    Model.UpdateLoop(createWeapon, deleteShield);
                 }));
 
                 Thread.Sleep(Model.RefreshInterval);

Gadgetlemage/Model.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using Gadgetlemage.DarkSouls;
+using System.Windows;
 
 namespace Gadgetlemage
 {
@@ -37,14 +38,14 @@ public class Model : PHook
         public DarkSouls.DarkSouls DarkSouls { get; set; }
 
         /// <summary>
-        /// Whether or not the weapon has created
+        /// Whether or not the game was loaded on the previous loop
         /// </summary>
-        public bool WeaponCreated { get; set; }
+        public bool PreviousLoaded { get; set; }
 
         /// <summary>
-        /// Whether or not the shield was deleted
+        /// Whether or not the black knight deaths has already been processed
         /// </summary>
-        public bool ShieldDeleted { get; set; }
+        public bool DeathProcessed { get; set; }
 
         /// <summary>
         /// List of all available black knight weapons
@@ -72,7 +73,7 @@ public BlackKnightWeapon BlackKnightShield
         {
             get
             {
-                return (Hooked) ? HOOKED_INTERVAL : UNHOOKED_INTERVAL;     
+                return (Hooked) ? HOOKED_INTERVAL : UNHOOKED_INTERVAL;
             }
         }
 
@@ -148,8 +149,8 @@ public Model() : base(0, MIN_LIFE_SPAN, processSelector) // RefreshInterval at 0
             OnHooked += DarkSoulsProcess_OnHooked;
             OnUnhooked += DarkSoulsProcess_OnUnhooked;
 
-            WeaponCreated = true;
-            ShieldDeleted = true;
+            DeathProcessed = false;
+            PreviousLoaded = false;
         }
 
         /// <summary>
@@ -207,135 +208,72 @@ public void DeleteShield()
         }
 
         /// <summary>
-        /// Automatically delete the shield from the player's inventory
+        /// Main update loop that will automatically create and delete black knight weapons if needed
         /// </summary>
-        public void AutomaticallyRemoveShield()
+        /// <param name="createWeapon">If it should automatically create the weapon</param>
+        /// <param name="deleteShield">If it should automatically delete the shield</param>
+        public void UpdateLoop(bool createWeapon, bool deleteShield)
         {
-            if (Ready)
+            bool CurrentLoaded = Loaded;
+
+            if (CurrentLoaded)
             {
-                bool alreadyOwns = DarkSouls.FindBlackKnightWeapon(BlackKnightShield);
                 bool IsBlackKnightDead = SelectedWeapon.IsConditionSatisfied();
+                bool IsBlackKnightAlive = !IsBlackKnightDead;
+                bool JustLoaded = !PreviousLoaded && CurrentLoaded;
 
                 /**
-                 * If the black knight is still alive, we reset the state of the Weapon
+                 * If the black knight is still alive, we reset the state of the Weapon and Shield
+                 * Only checks after the player just loaded back in because it is the only
+                 * reliable moment
                  */
-                if (!IsBlackKnightDead)
-                {
-                    ShieldDeleted = false;
-                }
-                // else the black knight is dead...
-                else
+                if (JustLoaded && IsBlackKnightAlive)
                 {
-                    if (alreadyOwns)
-                    {
-                        if (!ShieldDeleted)
-                        {
-                            /**
-                             * If the black knight is dead and the player has the shield
-                             * so we need to delete it
-                             */
-                            DeleteShield();
-                            ShieldDeleted = true;
-                        }
-                        else
-                        {
-                            /**
-                             * If the black knight is dead but the player still has the
-                             * shield. Maybe another black knight dropped one so we don't
-                             * do anything
-                             */
-                            // Nothing to do here
-                        }
-                    }
-                    else
-                    {
-                        if (!ShieldDeleted)
-                        {
-                            /**
-                             * The black knight is dead and we didn't delete the shield.
-                             * Hence it didn't drop so we don't need to delete anything
-                             */
-                            ShieldDeleted = true;
-                        }
-                        else
-                        {
-                            /**
-                             * The black knight is dead, the player doesn't have the shield
-                             * and we already removed it from the inventory. Everything's
-                             * good
-                             */
-                            // Nothing to do here
-                        }
-                    }
+                    DeathProcessed = false;
                 }
-            }
-        }
-
-        /// <summary>
-        /// Automatically Get the item if needed
-        /// </summary>
-        public void AutomaticallyCreateWeapon()
-        {
-            if (Ready)
-            {
-                bool IsBlackKnightDead = SelectedWeapon.IsConditionSatisfied();
 
                 /**
-                 * If the black knight is still alive, we reset the state of the Weapon
-                 */
-                if (!IsBlackKnightDead)
+                 * Only run logic when the black is dead and only run that logic once,
+                 * until the black knight is alive again
+                 */ 
+                if (IsBlackKnightDead && !DeathProcessed)
                 {
-                    WeaponCreated = false;
-                }
-                // else the black knight is dead...
-                else
-                {
-                    bool alreadyOwns = DarkSouls.FindBlackKnightWeapon(SelectedWeapon);
-
-                    if (alreadyOwns)
-                    {
-                        if (!WeaponCreated)
-                        {
-                            /**
-                             * If the black knight is dead and the player has the weapon
-                             * but we never gave it to him then it's a legit drop
-                             */
-                            WeaponCreated = true;
-                        }
-                        else
-                        {
-                            /**
-                             * If the black knight is dead and the player has the weapon
-                             * and we already gave it to him then it's all good and we
-                             * don't do anything
-                             */
-                            // Nothing to do here
-                        }
-                    }
-                    else
+                    // weapon
+                    if (createWeapon)
                     {
-                        if (!WeaponCreated)
+                        bool needsToCreate = !DarkSouls.FindBlackKnightWeapon(SelectedWeapon);
+
+                        if (needsToCreate)
                         {
                             /**
                              * If the black knight is dead, the player doesn't have the
                              * weapon and we didn't already gave it, then we give it 
                              */
                             CreateWeapon();
-                            WeaponCreated = true;
                         }
-                        else
+                    }
+
+                    // shield
+                    if (deleteShield)
+                    {
+                        bool needsToDelete = DarkSouls.FindBlackKnightWeapon(BlackKnightShield);
+
+                        if (needsToDelete)
                         {
                             /**
-                             * If the black knight is dead, the player doesn't have the
-                             * weapon but we aleady gave it, then we don't do anything.
-                             * Maybe the player intentionally removed the weapon from his
-                             * inventory.
+                             * If the black knight is dead and the player has the shield
+                             * so we need to delete it
                              */
-                            // Nothing to do here
+                            DeleteShield();
                         }
                     }
+                    
+                    // only execute this once per black knight death
+                    DeathProcessed = true;
                 }
             }
+
+            PreviousLoaded = CurrentLoaded;
         }
 
         /// <summary>

Gadgetlemage/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.0.0.0")]
+[assembly: AssemblyVersion("5.0.0.0")]
+[assembly: AssemblyFileVersion("5.0.0.0")]