diff --git a/KFGame/Classes/KFExplosion_ZedativeCloud.uc b/KFGame/Classes/KFExplosion_ZedativeCloud.uc index 527fe58..9b88f3b 100644 --- a/KFGame/Classes/KFExplosion_ZedativeCloud.uc +++ b/KFGame/Classes/KFExplosion_ZedativeCloud.uc @@ -52,8 +52,6 @@ simulated event ReplicatedEvent(name VarName) **/ simulated function Explode(GameExplosion NewExplosionTemplate, optional vector Direction) { - Super.Explode( NewExplosionTemplate, Direction ); - if (Role == Role_Authority) { ExplosionDelay = class'KFPerk_FieldMedic'.static.GetZedativeExplosionDelay(); @@ -67,6 +65,8 @@ simulated function Explode(GameExplosion NewExplosionTemplate, optional vector D ReplicatedExploTemplate = NewExplosionTemplate; } + + Super.Explode( NewExplosionTemplate, Direction ); } /** diff --git a/KFGame/Classes/KFGFxStartGameContainer_FindGame.uc b/KFGame/Classes/KFGFxStartGameContainer_FindGame.uc index e819484..72cd62b 100644 --- a/KFGame/Classes/KFGFxStartGameContainer_FindGame.uc +++ b/KFGame/Classes/KFGFxStartGameContainer_FindGame.uc @@ -194,7 +194,7 @@ function FillWhatsNew() item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Spring_Armory_Season_Pass", "ArmorySeasonPass", "https://store.steampowered.com/app/1524820/Killing_Floor_2__Armory_Season_Pass"); WhatsNewItems.AddItem(item); // KF2 Armory Season Pass 2023 - item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Summer2023_CosmeticsSeasonPass", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9661"); + item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Summer2023_CosmeticsSeasonPass", "FeaturedItemBundle", "https://store.steampowered.com/app/2363410/Killing_Floor_2__Cosmetics_Season_Pass"); WhatsNewItems.AddItem(item); // Featured Weapon item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Summer2023_S12Shockgun", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9655"); diff --git a/KFGame/Classes/KFGFxWidget_VoiceComms.uc b/KFGame/Classes/KFGFxWidget_VoiceComms.uc index a4bc584..53bfc66 100644 --- a/KFGame/Classes/KFGFxWidget_VoiceComms.uc +++ b/KFGame/Classes/KFGFxWidget_VoiceComms.uc @@ -52,8 +52,6 @@ function SetLocalizedText() TempObj = CreateObject("Object"); TempObj.SetString("text", class'KFLocalMessage_VoiceComms'.default.ToggleFriendlyHUDString); SetObject("toggleFriendlyText", TempObj); - - SetBool("toggleFriendlyVisibility", GetPC().WorldInfo.NetMode != NM_StandAlone); } function SaveVoiceCommSelection( int CommsIndex ) @@ -74,6 +72,8 @@ function EnableComm() bPlayedVoiceComm = false; SavedSelectionIndex = -1; + SetBool("toggleFriendlyVisibility", GetPC().WorldInfo.NetMode != NM_StandAlone && GetUsingGamepad()); + //Don't allow the user to open voice comms if they are dead. if(!PC.IsDead() && PC.Pawn != none) { @@ -225,6 +225,22 @@ function SetToggleFriendlyButtonActive(bool IsActive) ActionScriptVoid("toggleFriendlyActive"); } +/** Return whether the player input says we are currently using the gamepad */ +function bool GetUsingGamepad() +{ + if( class'WorldInfo'.static.IsConsoleBuild() ) + { + return true; + } + + if ( PC == none || PC.PlayerInput == none ) + { + return false; + } + // Always using the gamepad if we are on console. + return PC.PlayerInput.bUsingGamepad; +} + DefaultProperties { ControllerDampening=2.5f