1
0
This commit is contained in:
GenZmeY 2023-06-22 23:47:42 +03:00
parent 39b56bd58b
commit ef3db8a926
3 changed files with 21 additions and 5 deletions

View File

@ -52,8 +52,6 @@ simulated event ReplicatedEvent(name VarName)
**/ **/
simulated function Explode(GameExplosion NewExplosionTemplate, optional vector Direction) simulated function Explode(GameExplosion NewExplosionTemplate, optional vector Direction)
{ {
Super.Explode( NewExplosionTemplate, Direction );
if (Role == Role_Authority) if (Role == Role_Authority)
{ {
ExplosionDelay = class'KFPerk_FieldMedic'.static.GetZedativeExplosionDelay(); ExplosionDelay = class'KFPerk_FieldMedic'.static.GetZedativeExplosionDelay();
@ -67,6 +65,8 @@ simulated function Explode(GameExplosion NewExplosionTemplate, optional vector D
ReplicatedExploTemplate = NewExplosionTemplate; ReplicatedExploTemplate = NewExplosionTemplate;
} }
Super.Explode( NewExplosionTemplate, Direction );
} }
/** /**

View File

@ -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"); 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); WhatsNewItems.AddItem(item);
// KF2 Armory Season Pass 2023 // 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); WhatsNewItems.AddItem(item);
// Featured Weapon // Featured Weapon
item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Summer2023_S12Shockgun", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9655"); item = SetWhatsNewItem("img://UI_WhatsNew.UI_WhatsNew_Summer2023_S12Shockgun", "FeaturedItemBundle", "https://store.steampowered.com/buyitem/232090/9655");

View File

@ -52,8 +52,6 @@ function SetLocalizedText()
TempObj = CreateObject("Object"); TempObj = CreateObject("Object");
TempObj.SetString("text", class'KFLocalMessage_VoiceComms'.default.ToggleFriendlyHUDString); TempObj.SetString("text", class'KFLocalMessage_VoiceComms'.default.ToggleFriendlyHUDString);
SetObject("toggleFriendlyText", TempObj); SetObject("toggleFriendlyText", TempObj);
SetBool("toggleFriendlyVisibility", GetPC().WorldInfo.NetMode != NM_StandAlone);
} }
function SaveVoiceCommSelection( int CommsIndex ) function SaveVoiceCommSelection( int CommsIndex )
@ -74,6 +72,8 @@ function EnableComm()
bPlayedVoiceComm = false; bPlayedVoiceComm = false;
SavedSelectionIndex = -1; SavedSelectionIndex = -1;
SetBool("toggleFriendlyVisibility", GetPC().WorldInfo.NetMode != NM_StandAlone && GetUsingGamepad());
//Don't allow the user to open voice comms if they are dead. //Don't allow the user to open voice comms if they are dead.
if(!PC.IsDead() && PC.Pawn != none) if(!PC.IsDead() && PC.Pawn != none)
{ {
@ -225,6 +225,22 @@ function SetToggleFriendlyButtonActive(bool IsActive)
ActionScriptVoid("toggleFriendlyActive"); 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 DefaultProperties
{ {
ControllerDampening=2.5f ControllerDampening=2.5f