From de3230c71a3154f1c120291461d092ef5070a95f Mon Sep 17 00:00:00 2001
From: Shtoyan <shtoyan@yahoo.com>
Date: Mon, 7 Feb 2022 15:28:24 +0400
Subject: [PATCH] husk use Myammo func

---
 sources/Zeds/Mean/MeanZombieHusk.uc     |  2 +-
 sources/Zeds/Mean/MeanZombieHuskAmmo.uc |  7 +++++++
 sources/Zeds/Nice/NiceZombieHusk.uc     | 28 +++++++++++++++----------
 sources/Zeds/Nice/NiceZombieHuskAmmo.uc | 13 ++++++++++++
 4 files changed, 38 insertions(+), 12 deletions(-)
 create mode 100644 sources/Zeds/Mean/MeanZombieHuskAmmo.uc
 create mode 100644 sources/Zeds/Nice/NiceZombieHuskAmmo.uc

diff --git a/sources/Zeds/Mean/MeanZombieHusk.uc b/sources/Zeds/Mean/MeanZombieHusk.uc
index 82dcd86..b0ada50 100644
--- a/sources/Zeds/Mean/MeanZombieHusk.uc
+++ b/sources/Zeds/Mean/MeanZombieHusk.uc
@@ -48,7 +48,7 @@ function RangedAttack(Actor A) {
 defaultproperties
 {
     maxNormalShots=3
-    HuskFireProjClass=class'MeanHuskFireProjectile'
+    AmmunitionClass=class'MeanZombieHuskAmmo'
     remainingStuns=1
     MenuName="Mean Husk"
     ControllerClass=class'MeanZombieHuskController'
diff --git a/sources/Zeds/Mean/MeanZombieHuskAmmo.uc b/sources/Zeds/Mean/MeanZombieHuskAmmo.uc
new file mode 100644
index 0000000..9264e0f
--- /dev/null
+++ b/sources/Zeds/Mean/MeanZombieHuskAmmo.uc
@@ -0,0 +1,7 @@
+class MeanZombieHuskAmmo extends NiceZombieHuskAmmo;
+
+
+defaultproperties
+{
+  ProjectileClass=class'MeanHuskFireProjectile'
+}
\ No newline at end of file
diff --git a/sources/Zeds/Nice/NiceZombieHusk.uc b/sources/Zeds/Nice/NiceZombieHusk.uc
index 0ac191a..c1a981a 100644
--- a/sources/Zeds/Nice/NiceZombieHusk.uc
+++ b/sources/Zeds/Nice/NiceZombieHusk.uc
@@ -21,14 +21,20 @@ simulated function HeatTick(){
     }
     super.HeatTick();
 }
+
 simulated function PostBeginPlay()
 {
     // Difficulty Scaling
-    if (Level.Game != none && !bDiffAdjusted){
+    if (Level.Game != none && !bDiffAdjusted)
+    {
        ProjectileFireInterval = default.ProjectileFireInterval * 0.6;
     }
+    // and why TWI removed this feature...
+    MyAmmo = spawn(AmmunitionClass);
+
     super.PostBeginPlay();
 }
+
 // don't interrupt the bloat while he is puking
 simulated function bool HitCanInterruptAction()
 {
@@ -146,14 +152,14 @@ function SpawnTwoShots()
 
     if (!SavedFireProperties.bInitialized)
     {
-       SavedFireProperties.AmmoClass = class'SkaarjAmmo';
-       SavedFireProperties.ProjectileClass = HuskFireProjClass;
-       SavedFireProperties.WarnTargetPct = 1;
-       SavedFireProperties.MaxRange = 65535;
-       SavedFireProperties.bTossed = false;
-       SavedFireProperties.bTrySplash = true;
-       SavedFireProperties.bLeadTarget = true;
-       SavedFireProperties.bInstantHit = false;
+       SavedFireProperties.AmmoClass = MyAmmo.Class;
+       SavedFireProperties.ProjectileClass = MyAmmo.ProjectileClass;
+       SavedFireProperties.WarnTargetPct = MyAmmo.WarnTargetPct;
+       SavedFireProperties.MaxRange = MyAmmo.MaxRange;
+       SavedFireProperties.bTossed = MyAmmo.bTossed;
+       SavedFireProperties.bTrySplash = MyAmmo.bTrySplash;
+       SavedFireProperties.bLeadTarget = MyAmmo.bLeadTarget;
+       SavedFireProperties.bInstantHit = MyAmmo.bInstantHit;
        SavedFireProperties.bInitialized = true;
     }
 
@@ -173,7 +179,7 @@ function SpawnTwoShots()
     }
 
     // added projectile owner...
-    Spawn(HuskFireProjClass, self, , FireStart, FireRotation);
+    Spawn(SavedFireProperties.ProjectileClass, self, , FireStart, FireRotation);
 
     // Turn extra collision back on
     ToggleAuxCollision(true);
@@ -379,7 +385,7 @@ static simulated function PreCacheMaterials(LevelInfo myLevel)
 }
 defaultproperties
 {
-    HuskFireProjClass=class'NiceHuskFireProjectile'
+    AmmunitionClass=class'NiceZombieHuskAmmo'
     stunLoopStart=0.080000
     stunLoopEnd=0.900000
     idleInsertFrame=0.930000
diff --git a/sources/Zeds/Nice/NiceZombieHuskAmmo.uc b/sources/Zeds/Nice/NiceZombieHuskAmmo.uc
new file mode 100644
index 0000000..47f21ba
--- /dev/null
+++ b/sources/Zeds/Nice/NiceZombieHuskAmmo.uc
@@ -0,0 +1,13 @@
+class NiceZombieHuskAmmo extends Ammunition;
+
+
+defaultproperties
+{
+  ProjectileClass=class'NiceHuskFireProjectile'
+  WarnTargetPct=1
+  MaxRange=65535
+  bTossed=False
+  bTrySplash=True
+  bLeadTarget=True
+  bInstantHit=False
+}
\ No newline at end of file