fix for scrake rage not working

theengineertcr · Nov 11, 2023 · ba049b3 · ba049b3
1 parent cbb84f3
commit ba049b3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 21 deletions.
diff --git a/Classes/AdvSawZombieController.uc b/Classes/AdvSawZombieController.uc
@@ -38,23 +38,23 @@ function bool FireWeaponAt(Actor A) {
         return false;
     }
 
-    if (VSize(Pawn.Location - A.Location) < 300) {
-        aFacing = Normal(Vector(Pawn.Rotation));
-        TargetFacing = Normal(Vector(A.Rotation));
 
-        // Get the vector from A to B
-        aToB = A.Location - Pawn.Location;
-        BToa = Pawn.Location - A.Location;
+    aFacing = Normal(Vector(Pawn.Rotation));
+    TargetFacing = Normal(Vector(A.Rotation));
 
-        RelativeDir = aFacing dot aToB;
-        TargetRelativeDir = TargetFacing dot BToa;
+    // Get the vector from A to B
+    aToB = A.Location - Pawn.Location;
+    BToa = Pawn.Location - A.Location;
 
-        if (RelativeDir < -15) {
-            bFacingTarget = false;
-        } else {
-            bFacingTarget = true;
-        }
+    RelativeDir = aFacing dot aToB;
+    TargetRelativeDir = TargetFacing dot BToa;
+
+    if (RelativeDir < -15) {
+        bFacingTarget = false;
+    } else {
+        bFacingTarget = true;
     }
+
 
     if (CanAttack(A)) {
         Target = A;

diff --git a/Classes/AdvZombieScrake.uc b/Classes/AdvZombieScrake.uc
@@ -211,24 +211,20 @@ function bool MeleeDamageTarget(int hitdamage, vector pushdir) {
             }
         }
 
-        if ( KFHumanPawn(Controller.Target) != none )
-        {
+        if ( KFHumanPawn(Controller.Target) != none ) {
             //TODO - line below was KFPawn. Does this whole block need to be KFPawn, or is it OK as KFHumanPawn?
             KFHumanPawn(Controller.Target).TakeDamage(hitdamage, Instigator ,HitLocation,pushdir, CurrentDamType); //class 'KFmod.ZombieMeleeDamage');
 
-            if (KFHumanPawn(Controller.Target).Health <=0)
-            {
-                if ( !class'GameInfo'.static.UseLowGore() )
-                {
+            if (KFHumanPawn(Controller.Target).Health <=0) {
+                if ( !class'GameInfo'.static.UseLowGore() ) {
                     BloodHit = Spawn(class'KFMod.FeedingSpray',self,,Controller.Target.Location,rotator(pushdir));	 //
                     KFHumanPawn(Controller.Target).SpawnGibs(rotator(pushdir), 1);
                     TearBone=KFPawn(Controller.Target).GetClosestBone(HitLocation,Velocity,dummy);
                     KFHumanPawn(Controller.Target).HideBone(TearBone);
                 }
 
                 // Give us some Health back
-                if (Health <= (1.0-FeedThreshold)*HealthMax)
-                {
+                if (Health <= (1.0-FeedThreshold)*HealthMax) {
                     Health += FeedThreshold*HealthMax * Health/HealthMax;
                 }
             }