fixed issue involving cooldown not working properly for weapons with …

…long bursts
rheirman · Feb 19, 2019 · ea8dca2 · ea8dca2
1 parent 40e7176
commit ea8dca2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 24 deletions.
diff --git a/Assemblies/DualWield.dll b/Assemblies/DualWield.dll
diff --git a/Source/DualWield/Harmony/Jobdriver_Wait.cs b/Source/DualWield/Harmony/Jobdriver_Wait.cs
@@ -9,6 +9,7 @@
 
 namespace DualWield.Harmony
 {
+
     [HarmonyPatch(typeof(JobDriver_Wait), "CheckForAutoAttack")]
     public class Jobdriver_Wait_CheckForAutoAttack
     {
@@ -30,12 +31,13 @@ static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> inst
         }
         public static bool FullBodyAndOffHandBusy(Pawn_StanceTracker instance)
         {
-            if(instance.pawn.GetStancesOffHand() is Pawn_StanceTracker stOffHand)
+            if(instance.pawn.GetStancesOffHand() is Pawn_StanceTracker stOffHand && instance.pawn.equipment != null && instance.pawn.equipment.TryGetOffHandEquipment(out ThingWithComps twc))
             {
                 return stOffHand.FullBodyBusy && instance.FullBodyBusy;
             }
             return instance.FullBodyBusy;
         }
     }
+
 
 }
diff --git a/Source/DualWield/Harmony/RunAndGun.cs b/Source/DualWield/Harmony/RunAndGun.cs
@@ -38,28 +38,6 @@ static void Postfix(Pawn_StanceTracker stanceTracker, Stance_Cooldown stance)
             //SetStanceOffHand(stanceTracker, stance);
             Verb_TryCastNextBurstShot.SetStanceOffHand(stanceTracker, stance);
         }
-        /*
-        static void SetStanceOffHand(Pawn_StanceTracker stanceTracker, Stance_Cooldown stance)
-        {
-            ThingWithComps offHandEquip = null;
-            CompEquippable compEquippable = null;
-            Log.Message("calling RunAndGun.SetStanceOffHand");
-            if (stanceTracker.pawn.equipment != null && stanceTracker.pawn.equipment.TryGetOffHandEquipment(out ThingWithComps result) && result != stanceTracker.pawn.equipment.Primary)
-            {
-                offHandEquip = result;
-                compEquippable = offHandEquip.TryGetComp<CompEquippable>();
-            }
-            //Check if verb is one from a offhand weapon. 
-            if (compEquippable != null && stance.verb == compEquippable.PrimaryVerb && stanceTracker.pawn.GetStancesOffHand().curStance is Stance_Warmup_DW)
-            {
-                Log.Message("found offhand verb!, setting offhand stance cooldown");
-                Log.Message("Stance.type: " + stance.GetType().Name);
-                Log.Message("Stance.ticks: " + stance.ticksLeft);
-                stanceTracker.pawn.GetStancesOffHand().SetStance(stance);
-            }
-        }
-        */
-
 
         //When Run and Gun or the to be patched method isn't found, patch this stub method so no error is thrown. 
         public static void Stub(Pawn_StanceTracker stanceTracker, Stance_Cooldown stance)

diff --git a/Source/DualWield/Harmony/Verb.cs b/Source/DualWield/Harmony/Verb.cs
@@ -61,7 +61,7 @@ public static void SetStanceOffHand(Pawn_StanceTracker stanceTracker,  Stance_Co
             {
                 stanceTracker.pawn.GetStancesOffHand().SetStance(stance);
             }
-            else if (!(stanceTracker.curStance is Stance_Cooldown) && stanceTracker.curStance.GetType().Name != "Stance_RunAndGun_Cooldown")
+            else if (stanceTracker.curStance.GetType().Name != "Stance_RunAndGun_Cooldown")
             {
                 stanceTracker.SetStance(stance);
             }