Further fix for spot-casting of abilities

jecrell · Sep 16, 2018 · b55d4bd · b55d4bd
1 parent 800d296
commit b55d4bd
Show file tree

Hide file tree

Showing 24 changed files with 27 additions and 11 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -50,5 +50,7 @@ JecsTools.PatchOperationModLoaded
 Additions by ChJees
 Additions by roxxploxx
 Additions by Swenzi
-Additions and transpilers by Erdelf</description>
+Additions and transpilers by Erdelf
+Xen added himself to the credits for extensive hours of testing, debugging, some small fixes,
+and - for when Jec said "Hey should we make this into a public toolset for people to take advantage of all this cool stuff?" - Xen said, "Hell yes - this is awesome stuff - people will love it!"</description>
 </ModMetaData>
diff --git a/Assemblies/AbilityUser.dll b/Assemblies/AbilityUser.dll
diff --git a/Assemblies/CompDeflector.dll b/Assemblies/CompDeflector.dll
diff --git a/Source/.idea/.idea.JecsTools/.idea/contentModel.xml b/Source/.idea/.idea.JecsTools/.idea/contentModel.xml
diff --git a/Source/.idea/.idea.JecsTools/.idea/indexLayout.xml b/Source/.idea/.idea.JecsTools/.idea/indexLayout.xml
diff --git a/Source/AllModdingComponents/CompAbilityUser/Controller/JobDriver_CastAbilityVerb.cs b/Source/AllModdingComponents/CompAbilityUser/Controller/JobDriver_CastAbilityVerb.cs
@@ -20,7 +20,8 @@ protected override IEnumerable<Toil> MakeNewToils()
             yield return Toils_Misc.ThrowColonistAttackingMote(TargetIndex.A);
             if (TargetA.HasThing)
             {
-                if (!GetActor().IsFighting() || !Verb.UseAbilityProps.canCastInMelee)
+	            // !GetActor().IsFighting() || - removed from below "If" by xen for melee casting fix
+                if (!Verb.UseAbilityProps.canCastInMelee)
                 {
                     var getInRangeToil = Toils_Combat.GotoCastPosition(TargetIndex.A, false);
                     yield return getInRangeToil;

diff --git a/Source/AllModdingComponents/CompAbilityUser/bin/Release/AbilityUser.dll b/Source/AllModdingComponents/CompAbilityUser/bin/Release/AbilityUser.dll
diff --git a/Source/AllModdingComponents/CompActivatableEffect/bin/Release/CompActivatableEffect.dll b/Source/AllModdingComponents/CompActivatableEffect/bin/Release/CompActivatableEffect.dll
diff --git a/Source/AllModdingComponents/CompActivatableEffect/bin/Release/CompOversizedWeapon.dll b/Source/AllModdingComponents/CompActivatableEffect/bin/Release/CompOversizedWeapon.dll
diff --git a/Source/AllModdingComponents/CompAnimated/bin/Release/CompAnimated.dll b/Source/AllModdingComponents/CompAnimated/bin/Release/CompAnimated.dll
diff --git a/Source/AllModdingComponents/CompBalloon/bin/Release/CompBalloon.dll b/Source/AllModdingComponents/CompBalloon/bin/Release/CompBalloon.dll
diff --git a/Source/AllModdingComponents/CompDeflector/CompDeflector.cs b/Source/AllModdingComponents/CompDeflector/CompDeflector.cs
@@ -187,7 +187,7 @@ public virtual Verb ReflectionHandler(Verb newVerb)
             if (Props.canReflect)
             {
                 lastAccuracyRoll = ReflectionAccuracy();
-                var deflectVerb = newVerb;
+                var deflectVerbX = newVerb;
 
                 //Initialize VerbProperties
                 var newVerbProps = new VerbProperties
@@ -237,8 +237,8 @@ public virtual Verb ReflectionHandler(Verb newVerb)
                         break;
                 }
                 //Apply values
-                deflectVerb.verbProps = newVerbProps;
-                return deflectVerb;
+                deflectVerbX.verbProps = newVerbProps;
+                return deflectVerbX;
             }
             return newVerb;
         }

diff --git a/Source/AllModdingComponents/CompDeflector/bin/Release/CompDeflector.dll b/Source/AllModdingComponents/CompDeflector/bin/Release/CompDeflector.dll
diff --git a/Source/AllModdingComponents/CompDelayedSpawner/bin/Release/CompDelayedSpawner.dll b/Source/AllModdingComponents/CompDelayedSpawner/bin/Release/CompDelayedSpawner.dll
diff --git a/Source/AllModdingComponents/CompExtraSounds/bin/Release/CompExtraSounds.dll b/Source/AllModdingComponents/CompExtraSounds/bin/Release/CompExtraSounds.dll
diff --git a/Source/AllModdingComponents/CompInstalledPart/bin/Release/CompInstalledPart.dll b/Source/AllModdingComponents/CompInstalledPart/bin/Release/CompInstalledPart.dll
diff --git a/Source/AllModdingComponents/CompLumbering/bin/Release/CompLumbering.dll b/Source/AllModdingComponents/CompLumbering/bin/Release/CompLumbering.dll
diff --git a/Source/AllModdingComponents/CompOverlays/bin/Release/CompOverlays.dll b/Source/AllModdingComponents/CompOverlays/bin/Release/CompOverlays.dll
diff --git a/Source/AllModdingComponents/CompOversizedWeapon/bin/Release/CompOversizedWeapon.dll b/Source/AllModdingComponents/CompOversizedWeapon/bin/Release/CompOversizedWeapon.dll
diff --git a/Source/AllModdingComponents/CompToggleDef/bin/Release/CompToggleDef.dll b/Source/AllModdingComponents/CompToggleDef/bin/Release/CompToggleDef.dll
diff --git a/Source/AllModdingComponents/CompToggleDef/bin/Release/CompToggleDef.pdb b/Source/AllModdingComponents/CompToggleDef/bin/Release/CompToggleDef.pdb
diff --git a/Source/AllModdingComponents/CompVehicle/bin/Release/CompVehicle.dll b/Source/AllModdingComponents/CompVehicle/bin/Release/CompVehicle.dll
diff --git a/Source/AllModdingComponents/JecsTools/bin/Release/0JecsTools.dll b/Source/AllModdingComponents/JecsTools/bin/Release/0JecsTools.dll
diff --git a/Source/Assemblies/CompSlotLoadable.dll b/Source/Assemblies/CompSlotLoadable.dll