From d4403a970ba22fc5c794b7d9e4cd3011c0b3758d Mon Sep 17 00:00:00 2001 From: Forrest Keller Date: Sat, 28 Oct 2017 10:52:19 -0500 Subject: [PATCH] Another attempt to fix Demo AOE --- ServerExt/Classes/ExtProj_DynamiteGrenade.uc | 9 +-------- ServerExt/Classes/ExtProj_HighExplosive_M16M203.uc | 9 +-------- ServerExt/Classes/ExtProj_HighExplosive_M79.uc | 9 +-------- ServerExt/Classes/ExtProj_Rocket_RPG7.uc | 9 +-------- ServerExt/Classes/ExtProj_Rocket_Seeker6.uc | 9 +-------- ServerExt/Classes/ExtProj_Thrown_C4.uc | 9 +-------- 6 files changed, 6 insertions(+), 48 deletions(-) diff --git a/ServerExt/Classes/ExtProj_DynamiteGrenade.uc b/ServerExt/Classes/ExtProj_DynamiteGrenade.uc index c8f7692..a7fc326 100644 --- a/ServerExt/Classes/ExtProj_DynamiteGrenade.uc +++ b/ServerExt/Classes/ExtProj_DynamiteGrenade.uc @@ -3,9 +3,8 @@ class ExtProj_DynamiteGrenade extends KFProj_DynamiteGrenade; simulated protected function PrepareExplosionTemplate() { local ExtPlayerReplicationInfo MyPRI; - local Ext_PerkDemolition DemoPerk; - Super(KFProjectile).PrepareExplosionTemplate(); + Super.PrepareExplosionTemplate(); if(Instigator == None) return; @@ -25,12 +24,6 @@ simulated protected function PrepareExplosionTemplate() ExplosionTemplate.ExplosionEffects = AltExploEffects; ExplosionTemplate.ExplosionSound = class'KFPerk_Demolitionist'.static.GetConcussiveExplosionSound(); } - - DemoPerk = Ext_PerkDemolition(MyPRI.FCurrentPerk); - if( DemoPerk == none ) - return; - - ExplosionTemplate.DamageRadius *= DemoPerk.GetAoERadiusModifier(); } } diff --git a/ServerExt/Classes/ExtProj_HighExplosive_M16M203.uc b/ServerExt/Classes/ExtProj_HighExplosive_M16M203.uc index 8306446..cde24a4 100644 --- a/ServerExt/Classes/ExtProj_HighExplosive_M16M203.uc +++ b/ServerExt/Classes/ExtProj_HighExplosive_M16M203.uc @@ -3,9 +3,8 @@ class ExtProj_HighExplosive_M16M203 extends KFProj_HighExplosive_M16M203; simulated protected function PrepareExplosionTemplate() { local ExtPlayerReplicationInfo MyPRI; - local Ext_PerkDemolition DemoPerk; - Super(KFProjectile).PrepareExplosionTemplate(); + Super.PrepareExplosionTemplate(); if(Instigator == None) return; @@ -25,12 +24,6 @@ simulated protected function PrepareExplosionTemplate() ExplosionTemplate.ExplosionEffects = AltExploEffects; ExplosionTemplate.ExplosionSound = class'KFPerk_Demolitionist'.static.GetConcussiveExplosionSound(); } - - DemoPerk = Ext_PerkDemolition(MyPRI.FCurrentPerk); - if( DemoPerk == none ) - return; - - ExplosionTemplate.DamageRadius *= DemoPerk.GetAoERadiusModifier(); } } diff --git a/ServerExt/Classes/ExtProj_HighExplosive_M79.uc b/ServerExt/Classes/ExtProj_HighExplosive_M79.uc index 811d15c..13b22bb 100644 --- a/ServerExt/Classes/ExtProj_HighExplosive_M79.uc +++ b/ServerExt/Classes/ExtProj_HighExplosive_M79.uc @@ -3,9 +3,8 @@ class ExtProj_HighExplosive_M79 extends KFProj_HighExplosive_M79; simulated protected function PrepareExplosionTemplate() { local ExtPlayerReplicationInfo MyPRI; - local Ext_PerkDemolition DemoPerk; - Super(KFProjectile).PrepareExplosionTemplate(); + Super.PrepareExplosionTemplate(); if(Instigator == None) return; @@ -25,12 +24,6 @@ simulated protected function PrepareExplosionTemplate() ExplosionTemplate.ExplosionEffects = AltExploEffects; ExplosionTemplate.ExplosionSound = class'KFPerk_Demolitionist'.static.GetConcussiveExplosionSound(); } - - DemoPerk = Ext_PerkDemolition(MyPRI.FCurrentPerk); - if( DemoPerk == none ) - return; - - ExplosionTemplate.DamageRadius *= DemoPerk.GetAoERadiusModifier(); } } diff --git a/ServerExt/Classes/ExtProj_Rocket_RPG7.uc b/ServerExt/Classes/ExtProj_Rocket_RPG7.uc index 1a7ffde..99c1610 100644 --- a/ServerExt/Classes/ExtProj_Rocket_RPG7.uc +++ b/ServerExt/Classes/ExtProj_Rocket_RPG7.uc @@ -3,9 +3,8 @@ class ExtProj_Rocket_RPG7 extends KFProj_Rocket_RPG7; simulated protected function PrepareExplosionTemplate() { local ExtPlayerReplicationInfo MyPRI; - local Ext_PerkDemolition DemoPerk; - Super(KFProjectile).PrepareExplosionTemplate(); + Super.PrepareExplosionTemplate(); if(Instigator == None) return; @@ -25,12 +24,6 @@ simulated protected function PrepareExplosionTemplate() ExplosionTemplate.ExplosionEffects = AltExploEffects; ExplosionTemplate.ExplosionSound = class'KFPerk_Demolitionist'.static.GetConcussiveExplosionSound(); } - - DemoPerk = Ext_PerkDemolition(MyPRI.FCurrentPerk); - if( DemoPerk == none ) - return; - - ExplosionTemplate.DamageRadius *= DemoPerk.GetAoERadiusModifier(); } } diff --git a/ServerExt/Classes/ExtProj_Rocket_Seeker6.uc b/ServerExt/Classes/ExtProj_Rocket_Seeker6.uc index 74dda47..8d36751 100644 --- a/ServerExt/Classes/ExtProj_Rocket_Seeker6.uc +++ b/ServerExt/Classes/ExtProj_Rocket_Seeker6.uc @@ -3,9 +3,8 @@ class ExtProj_Rocket_Seeker6 extends KFProj_Rocket_Seeker6; simulated protected function PrepareExplosionTemplate() { local ExtPlayerReplicationInfo MyPRI; - local Ext_PerkDemolition DemoPerk; - Super(KFProjectile).PrepareExplosionTemplate(); + Super.PrepareExplosionTemplate(); if(Instigator == None) return; @@ -25,12 +24,6 @@ simulated protected function PrepareExplosionTemplate() ExplosionTemplate.ExplosionEffects = AltExploEffects; ExplosionTemplate.ExplosionSound = class'KFPerk_Demolitionist'.static.GetConcussiveExplosionSound(); } - - DemoPerk = Ext_PerkDemolition(MyPRI.FCurrentPerk); - if( DemoPerk == none ) - return; - - ExplosionTemplate.DamageRadius *= DemoPerk.GetAoERadiusModifier(); } } diff --git a/ServerExt/Classes/ExtProj_Thrown_C4.uc b/ServerExt/Classes/ExtProj_Thrown_C4.uc index c532307..c692b2b 100644 --- a/ServerExt/Classes/ExtProj_Thrown_C4.uc +++ b/ServerExt/Classes/ExtProj_Thrown_C4.uc @@ -3,9 +3,8 @@ class ExtProj_Thrown_C4 extends KFProj_Thrown_C4; simulated protected function PrepareExplosionTemplate() { local ExtPlayerReplicationInfo MyPRI; - local Ext_PerkDemolition DemoPerk; - Super(KFProjectile).PrepareExplosionTemplate(); + Super.PrepareExplosionTemplate(); if(Instigator == None) return; @@ -25,12 +24,6 @@ simulated protected function PrepareExplosionTemplate() ExplosionTemplate.ExplosionEffects = AltExploEffects; ExplosionTemplate.ExplosionSound = class'KFPerk_Demolitionist'.static.GetConcussiveExplosionSound(); } - - DemoPerk = Ext_PerkDemolition(MyPRI.FCurrentPerk); - if( DemoPerk == none ) - return; - - ExplosionTemplate.DamageRadius *= DemoPerk.GetAoERadiusModifier(); } }