From ea8dca206f84ca564f939ac0a80c14dfa05e9fe0 Mon Sep 17 00:00:00 2001
From: Roel <roelheirman@gmail.com>
Date: Tue, 19 Feb 2019 17:24:07 +0100
Subject: [PATCH] fixed issue involving cooldown not working properly for
 weapons with long bursts

---
 Assemblies/DualWield.dll                   | Bin 75264 -> 75264 bytes
 Source/DualWield/Harmony/Jobdriver_Wait.cs |   4 +++-
 Source/DualWield/Harmony/RunAndGun.cs      |  22 ---------------------
 Source/DualWield/Harmony/Verb.cs           |   2 +-
 4 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/Assemblies/DualWield.dll b/Assemblies/DualWield.dll
index 77772aa3ea559c74a857df39fe7dbdacf109f0b1..20cc733e643f2c47a9c82c3d65f658f060f1ee96 100644
GIT binary patch
delta 6774
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
ZI2+FP+I{SILD$%CuQQr8u!1Dhe*>6aKZ^hW

delta 6781
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

diff --git a/Source/DualWield/Harmony/Jobdriver_Wait.cs b/Source/DualWield/Harmony/Jobdriver_Wait.cs
index fe774da..e6d6ad2 100644
--- 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
index 572f70b..b4ad40a 100644
--- 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
index 2ae7ee1..2a8eec4 100644
--- 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);
             }