Merge pull request 'Limit Bloat Vomit super damage' (#29) from BloatBileBullshit into dev

Reviewed-on: https://insultplayers.ru/git/dkanus/NicePack/pulls/29

sources/NiceHumanPawn.uc

@@ -69,7 +69,7 @@ function ReplaceRequiredEquipment()
     RequiredEquipment[0] = string(class'NiceMachete');
     RequiredEquipment[1] = string(class'Nice9mmPlus');
     RequiredEquipment[2] = string(class'ScrnFrag');
-    RequiredEquipment[3] = string(class'ScrnSyringe');
+    RequiredEquipment[3] = string(class'NiceSyringe');
     RequiredEquipment[4] = string(class'KFMod.Welder');
 }
 
@@ -420,10 +420,10 @@ function ServerBuyWeapon(class<Weapon> WClass, float ItemWeight){
        Price = WP.Default.Cost;
        if(KFPlayerReplicationInfo(PlayerReplicationInfo).ClientVeteranSkill != none){
            Price *= KFPlayerReplicationInfo(PlayerReplicationInfo).ClientVeteranSkill.static.GetCostScaling(KFPlayerReplicationInfo(PlayerReplicationInfo), WP);
-           if(class'ScrnBalance'.default.Mut.bBuyPerkedWeaponsOnly 
+           if(class'ScrnBalance'.default.Mut.bBuyPerkedWeaponsOnly
-                   && WP.default.CorrespondingPerkIndex != 7 
+                   && WP.default.CorrespondingPerkIndex != 7
                    && WP.default.CorrespondingPerkIndex != KFPlayerReplicationInfo(PlayerReplicationInfo).ClientVeteranSkill.default.PerkIndex )
-               return;    
+               return;
        }
        SellValue = Price * 0.75;
        Price = int(Price);
@@ -507,11 +507,11 @@ function bool AddInventory(inventory NewItem){
     if(weap != none){
        if(Dualies(weap) != none){
            if((DualDeagle(weap) != none || Dual44Magnum(weap) != none || DualMK23Pistol(weap) != none)
-                 && weap.InventoryGroup != 4 ) { 
+                 && weap.InventoryGroup != 4 ) {
                if(KFPRI != none &&
                    ClassIsChildOf(KFPRI.ClientVeteranSkill, class'ScrnVetGunslinger'))
                    weap.InventoryGroup = 3;
-               else 
+               else
                    weap.InventoryGroup = 2;
                GroupChanged = true;
            }
@@ -521,7 +521,7 @@ function bool AddInventory(inventory NewItem){
        }
            weap.bIsTier3Weapon = true;
     }
-    if(GroupChanged) 
+    if(GroupChanged)
        ClientSetInventoryGroup(NewItem.class, NewItem.InventoryGroup);
     if(super(SRHumanPawn).AddInventory(NewItem)){
        if(weap != none && weap.bTorchEnabled)
@@ -568,7 +568,7 @@ simulated function ThrowGrenade()
         super.ThrowGrenade();
         return;
     }
- 
+
     if(playerGrenade == none)
        playerGrenade = FindPlayerGrenade();
     if(playerGrenade != none && playerGrenade.HasAmmo()){
@@ -650,7 +650,7 @@ simulated function ApplyWeaponStats(Weapon NewWeapon){
        InventorySpeedModifier += default.GroundSpeed * (8 - weaponWeight) * 0.025;
        // ScrN Armor can slow down players (or even boost) -- PooSH
        InventorySpeedModifier -= default.GroundSpeed * GetCurrentVestClass().default.SpeedModifier;
-    } 
+    }
 }
 simulated function ModifyVelocity(float DeltaTime, vector OldVelocity){
     local NicePack NicePackMutator;
@@ -699,7 +699,7 @@ simulated function ModifyVelocity(float DeltaTime, vector OldVelocity){
                GroundSpeed = StoryInv.ForcedGroundSpeed;
                return;
            }
-       }    
+       }
        if(bTraderSpeedBoost && !KFGameReplicationInfo(Level.GRI).bWaveInProgress)
            MovementMod *= TraderSpeedBoost;
        if(Health < HealthMax && medicAdrenaliteTime > 0){
@@ -846,7 +846,7 @@ function VeterancyChanged(){
        nicePlayer.TriggerSelectEventOnPerkChange(nicePrevPerkClass,
            class<NiceVeterancyTypes>(KFPRI.ClientVeteranSkill));
     }
-    
+
     super.VeterancyChanged();
 }
 simulated function AltFire(optional float F){

sources/NicePlayerController.uc

@@ -212,6 +212,20 @@ simulated function ClientPostLogin(){
     // Change HUD parameters
     class'ScrnHUD'.default.EnemyHealthBarHeight = 4.0;
 }
+
+// fix crooked camera after you die with active `ViewShake`
+function StopViewShaking() {
+    ShakeRotMax  = vect(0, 0, 0);
+    ShakeRotRate = vect(0, 0, 0);
+    ShakeRotTime = vect(0, 0, 0);
+    ShakeOffsetMax  = vect(0, 0, 0);
+    ShakeOffsetRate = vect(0, 0, 0);
+    ShakeOffsetTime = vect(0, 0, 0);
+    // add missing variables
+    ShakeOffset = vect(0, 0, 0);
+    ShakeRot = Rot(0, 0, 0);
+}
+
 function ShowLobbyMenu(){
     Super.ShowLobbyMenu();
 }
@@ -1225,7 +1239,7 @@ function LoadDualWieldables(){
     local class<NiceWeaponPickup> WP;
     local class<NiceSingle> W;
     local int i;
-    
+
     CPRL = class'ClientPerkRepLink'.Static.FindStats(self);
     if(CPRL == none || CPRL.ShopInventory.Length == 0)
        return;

sources/Weapons/Playable/Tools/NiceSyringe.uc

@@ -0,0 +1,8 @@
+class NiceSyringe extends ScrnSyringe;
+
+defaultproperties {
+    ItemName="Nice Med-Syringe"
+    FireModeClass(0)=class'NiceSyringeFire'
+    FireModeClass(1)=class'NiceSyringeAltFire'
+    PickupClass=class'NiceSyringePickup'
+}

sources/Weapons/Playable/Tools/NiceSyringeAltFire.uc

@@ -0,0 +1 @@
+class NiceSyringeAltFire extends ScrnSyringeAltFire;

sources/Weapons/Playable/Tools/NiceSyringeFire.uc

@@ -0,0 +1,23 @@
+class NiceSyringeFire extends ScrnSyringeFire;
+
+// default == 80
+const SEARCH_RADIUS=120.0;
+
+function KFHumanPawn GetHealee() {
+    local KFHumanPawn KFHP, BestKFHP;
+    local vector Dir;
+    local float TempDot, BestDot;
+
+    Dir = vector(Instigator.GetViewRotation());
+
+    foreach Instigator.VisibleCollidingActors(class'KFHumanPawn', KFHP, SEARCH_RADIUS) {
+        if (KFHP.Health < KFHP.HealthMax && KFHP.Health > 0) {
+            TempDot = Dir dot (KFHP.Location - Instigator.Location);
+            if (TempDot > 0.7 && TempDot > BestDot) {
+                BestKFHP = KFHP;
+                BestDot = TempDot;
+            }
+        }
+    }
+    return BestKFHP;
+}

sources/Weapons/Playable/Tools/NiceSyringePickup.uc

@@ -0,0 +1,6 @@
+class NiceSyringePickup extends ScrnSyringePickup;
+
+defaultproperties {
+    ItemName="Nice Med-Syringe"
+    InventoryType=class'NiceSyringe'
+}

sources/Zeds/Nice/NiceBloatVomit.uc

@@ -0,0 +1,30 @@
+class NiceBloatVomit extends KFBloatVomit;
+
+// limit how much you can damage zeds
+const DAMAGECOUNT=10;
+var private transient int DamageTicked;
+
+auto state Flying {
+    simulated function ProcessTouch(Actor Other, Vector HitLocation) {
+        // add damage limit
+        if (DamageTicked >= DAMAGECOUNT) {
+            BlowUp(HitLocation);
+            return;
+        }
+        if (ExtendedZCollision(Other) != none) {
+            return;
+        }
+        if (
+            Other != Instigator &&
+            (Other.IsA('Pawn') || Other.IsA('DestroyableObjective') || Other.bProjTarget)
+        ) {
+            DamageTicked += 1;
+            // warn("DamageTicked: " $ DamageTicked);
+            // use server DelayedHurtRadius() instead?
+            HurtRadius(Damage, DamageRadius, MyDamageType, MomentumTransfer, HitLocation);
+        }
+        else if (Other != Instigator && Other.bBlockActors) {
+            HitWall(Normal(HitLocation - Location), Other);
+        }
+	}
+}

sources/Zeds/Nice/NiceZombieBloat.uc

@@ -173,7 +173,8 @@ function SpawnTwoShots()
     if ( !SavedFireProperties.bInitialized )
     {
        SavedFireProperties.AmmoClass = Class'SkaarjAmmo';
-       SavedFireProperties.ProjectileClass = Class'KFBloatVomit';
+       // use fixed bile class, to prevent super high damage to zeds
+       SavedFireProperties.ProjectileClass = Class'NiceBloatVomit';
        SavedFireProperties.WarnTargetPct = 1;
        SavedFireProperties.MaxRange = 500;
        SavedFireProperties.bTossed = False;
@@ -185,13 +186,13 @@ function SpawnTwoShots()
     // Turn off extra collision before spawning vomit, otherwise spawn fails
     ToggleAuxCollision(false);
     FireRotation = Controller.AdjustAim(SavedFireProperties,FireStart,600);
-    Spawn(Class'KFBloatVomit',,,FireStart,FireRotation);
+    Spawn(SavedFireProperties.ProjectileClass,,,FireStart,FireRotation);
     FireStart-=(0.5*CollisionRadius*Y);
     FireRotation.Yaw -= 1200;
-    spawn(Class'KFBloatVomit',,,FireStart, FireRotation);
+    spawn(SavedFireProperties.ProjectileClass,,,FireStart, FireRotation);
     FireStart+=(CollisionRadius*Y);
     FireRotation.Yaw += 2400;
-    spawn(Class'KFBloatVomit',,,FireStart, FireRotation);
+    spawn(SavedFireProperties.ProjectileClass,,,FireStart, FireRotation);
     // Turn extra collision back on
     ToggleAuxCollision(true);
 }