made runAndGun compatible with A18

rheirman · Oct 25, 2017 · 42586f6 · 42586f6
1 parent 371234a
commit 42586f6
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -2,7 +2,7 @@
 <ModMetaData>
 	<name>RunAndGun</name>
 	<author>Roolo</author>
-	<targetVersion>0.17.0</targetVersion>
+	<targetVersion>0.18.0</targetVersion>
 	<description> Your colonists can never be a true Rambo if they cannot gun while they are running. Therefore, this mod adds a mode that, when enabled, allows drafted colonists to shoot 
 while moving at the cost of an accuracy and movement penalty.These penalties can be modified in the mod settings of this mod. 
 Some things to take into account: 

diff --git a/Assemblies/RunAndGun.dll b/Assemblies/RunAndGun.dll
diff --git a/Source/RunAndGun/Harmony/JobDriver_SetupToils.cs b/Source/RunAndGun/Harmony/JobDriver_SetupToils.cs
@@ -52,14 +52,14 @@ static void checkForAutoAttack(JobDriver_Goto __instance)
                 if (verb != null && !verb.verbProps.MeleeRange)
                 {
                     TargetScanFlags targetScanFlags = TargetScanFlags.NeedLOSToPawns | TargetScanFlags.NeedLOSToNonPawns | TargetScanFlags.NeedThreat;
-                    if (verb.verbProps.ai_IsIncendiary)
+                    if (verb.IsIncendiary())
                     {
                         targetScanFlags |= TargetScanFlags.NeedNonBurning;
                     }
                     Thing thing = (Thing)AttackTargetFinder.BestShootTargetFromCurrentPosition(__instance.pawn, null, verb.verbProps.range, verb.verbProps.minRange, targetScanFlags);
                     if (thing != null)
                     {
-                        __instance.pawn.equipment.TryStartAttack(thing);
+                        __instance.pawn.TryStartAttack(thing);
                         return;
                     }
                 }

diff --git a/Source/RunAndGun/Harmony/Verb_TryCastNextBurstShot.cs b/Source/RunAndGun/Harmony/Verb_TryCastNextBurstShot.cs
@@ -70,7 +70,7 @@ static bool Prefix(Verb __instance)
             else
             {
                 __instance.state = VerbState.Idle;
-                __instance.CasterPawn.stances.SetStance(new Stance_RunAndGun_Cooldown(__instance.verbProps.AdjustedCooldownTicks(__instance.ownerEquipment), currentTarget, __instance));
+                __instance.CasterPawn.stances.SetStance(new Stance_RunAndGun_Cooldown(__instance.verbProps.AdjustedCooldownTicks(__instance, __instance.CasterPawn, __instance.ownerEquipment), currentTarget, __instance));
                 if (__instance.castCompleteCallback != null)
                 {
                     __instance.castCompleteCallback();

diff --git a/Source/RunAndGun/obj/Debug/RunAndGun.dll b/Source/RunAndGun/obj/Debug/RunAndGun.dll