KillingFloor2/KF2-ControlledVoteCollector
KillingFloor2/KF2-ControlledVoteCollector
1
0
Fork 0
Code Releases 3 Activity

Merge pull request #4 from GenZmeY/one-player

Browse Source 
fixes for solo play
This commit is contained in:
GenZmeY 2023-06-29 02:11:19 +03:00 committed by GitHub
commit 464ba0f492
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CVC/Classes/CVC_RepInfo.uc
View File

@ -38,6 +38,7 @@ public reliable client function WriteToChat(String Message, optional String HexC
if (KFPC.MyGFxManager.PartyWidget != None && KFPC.MyGFxManager.PartyWidget.PartyChatWidget != None) if (KFPC.MyGFxManager.PartyWidget != None && KFPC.MyGFxManager.PartyWidget.PartyChatWidget != None)
{ {
KFPC.MyGFxManager.PartyWidget.PartyChatWidget.SetVisible(true);
KFPC.MyGFxManager.PartyWidget.PartyChatWidget.AddChatMessage(Message, HexColor); KFPC.MyGFxManager.PartyWidget.PartyChatWidget.AddChatMessage(Message, HexColor);
} }

10
CVC/Classes/CVC_VoteCollector.uc
View File

@ -37,6 +37,7 @@ var private String KickeeName;
var private String YesVotesPlayers, NoVotesPlayers; var private String YesVotesPlayers, NoVotesPlayers;
var private bool AllowHudNotification; var private bool AllowHudNotification;
var private bool AllowSTPNotification; // SkipTrader and Pause
replication replication
{ {
@ -646,6 +647,8 @@ public function ServerStartVoteSkipTrader(PlayerReplicationInfo PRI)
KFPRI.ShowSkipTraderVote(PRI, CurrentVoteTime, !(KFPRI == PRI) && PRI.GetTeamNum() != 255); KFPRI.ShowSkipTraderVote(PRI, CurrentVoteTime, !(KFPRI == PRI) && PRI.GetTeamNum() != 255);
} }
AllowSTPNotification = KFPRIs.Length > 1;
KFGI.BroadcastLocalized(KFGI, class'KFLocalMessage', LMT_SkipTraderVoteStarted, CurrentSkipTraderVote.PlayerPRI); KFGI.BroadcastLocalized(KFGI, class'KFLocalMessage', LMT_SkipTraderVoteStarted, CurrentSkipTraderVote.PlayerPRI);
SetTimer(CurrentVoteTime, false, nameof(ConcludeVoteSkipTrader), Self); SetTimer(CurrentVoteTime, false, nameof(ConcludeVoteSkipTrader), Self);
SetTimer(1, true, nameof(UpdateTimer), Self); SetTimer(1, true, nameof(UpdateTimer), Self);
@ -692,7 +695,7 @@ public reliable server function RecieveVoteSkipTrader(PlayerReplicationInfo PRI,
`Log_Trace(); `Log_Trace();
MustNotify = (PlayersThatHaveVoted.Find(PRI) == INDEX_NONE); MustNotify = (PlayersThatHaveVoted.Find(PRI) == INDEX_NONE && AllowSTPNotification);
Super.RecieveVoteSkipTrader(PRI, bSkip); Super.RecieveVoteSkipTrader(PRI, bSkip);
@ -807,6 +810,8 @@ public function ServerStartVotePauseGame(PlayerReplicationInfo PRI)
KFPRI.ShowPauseGameVote(PRI, CurrentVoteTime, !(KFPRI == PRI)); KFPRI.ShowPauseGameVote(PRI, CurrentVoteTime, !(KFPRI == PRI));
} }
AllowSTPNotification = KFPRIs.Length > 1;
KFGI.BroadcastLocalized(KFGI, class'KFLocalMessage', bIsEndlessPaused ? LMT_ResumeVoteStarted : LMT_PauseVoteStarted, CurrentPauseGameVote.PlayerPRI); KFGI.BroadcastLocalized(KFGI, class'KFLocalMessage', bIsEndlessPaused ? LMT_ResumeVoteStarted : LMT_PauseVoteStarted, CurrentPauseGameVote.PlayerPRI);
SetTimer(CurrentVoteTime, false, nameof(ConcludeVotePauseGame), Self); SetTimer(CurrentVoteTime, false, nameof(ConcludeVotePauseGame), Self);
SetTimer(1, true, nameof(UpdatePauseGameTimer), Self); SetTimer(1, true, nameof(UpdatePauseGameTimer), Self);
@ -853,7 +858,7 @@ public reliable server function ReceiveVotePauseGame(PlayerReplicationInfo PRI,
`Log_Trace(); `Log_Trace();
MustNotify = (PlayersThatHaveVoted.Find(PRI) == INDEX_NONE); MustNotify = (PlayersThatHaveVoted.Find(PRI) == INDEX_NONE && AllowSTPNotification);
Super.ReceiveVotePauseGame(PRI, bSkip); Super.ReceiveVotePauseGame(PRI, bSkip);
@ -1118,4 +1123,5 @@ public function int GetNextMap()
defaultproperties defaultproperties
{ {
AllowHudNotification = true; AllowHudNotification = true;
AllowSTPNotification = true;
} }