Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable a button to allow players to change teams #872

Open
wants to merge 21 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions Northstar.Client/mod/scripts/vscripts/ui/menu_ingame.nut
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,8 @@ void function InitInGameMPMenu()
var gameHeader = AddComboButtonHeader( comboStruct, headerIndex, "#MENU_HEADER_GAME" )
var leaveButton = AddComboButton( comboStruct, headerIndex, buttonIndex++, "#LEAVE_MATCH" )
Hud_AddEventHandler( leaveButton, UIE_CLICK, OnLeaveButton_Activate )
#if DEV
var devButton = AddComboButton( comboStruct, headerIndex, buttonIndex++, "Dev" )
Hud_AddEventHandler( devButton, UIE_CLICK, AdvanceMenuEventHandler( GetMenu( "DevMenu" ) ) )
#endif
Zanieon marked this conversation as resolved.
Show resolved Hide resolved
ASpoonPlaysGames marked this conversation as resolved.
Show resolved Hide resolved
var devButton = AddComboButton( comboStruct, headerIndex, buttonIndex++, "#SWITCH_TEAMS" )
Hud_AddEventHandler( devButton, UIE_CLICK, OnRequestTeamSwitch )

headerIndex++
buttonIndex = 0
Expand Down Expand Up @@ -700,3 +698,9 @@ void function SetTitanSelectButtonVisibleState( bool state )
Hud_Hide( file.titanSelectButton )
}
}

void function OnRequestTeamSwitch( var button )
{
ClientCommand( "changeteam" )
CloseAllMenus()
}
4 changes: 4 additions & 0 deletions Northstar.CustomServers/mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@
"Name": "ns_progression_enabled",
"DefaultValue": "0",
"Flags": "ARCHIVE_PLAYERPROFILE"
},
{
"Name": "ns_allow_team_change",
"DefaultValue": "1"
}
],
"Scripts": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,12 @@ struct {
array<entity> specCams

entity functionref( entity player, entity basePoint ) recalculateRespawnAsTitanStartPointCallback
table<entity, float> playerChangeTeamTimeBuffer
} file

void function BaseGametype_Init_MPSP()
{
AddClientCommandCallback( "changeteam", ClientCommandCallbackChangeTeam )
AddSpawnCallback( "info_intermission", SetIntermissionCamera )

AddPostDamageCallback( "player", AddToTitanDamageStat )
Expand Down Expand Up @@ -630,6 +632,33 @@ void function SetRecalculateRespawnAsTitanStartPointCallback( entity functionref
file.recalculateRespawnAsTitanStartPointCallback = callbackFunc
}

bool function ClientCommandCallbackChangeTeam( entity player, array<string> args )
{
if ( !GetConVarBool( "ns_allow_team_change" ) )
{
SendHudMessage( player, "Server does not allow team change", -1, 0.4, 255, 255, 255, 255, 0.15, 3.0, 0.5 )
return true
}

if ( !( player in file.playerChangeTeamTimeBuffer ) )
file.playerChangeTeamTimeBuffer[ player ] <- Time() + 5
else
{
if ( file.playerChangeTeamTimeBuffer[ player ] > Time() )
{
SendHudMessage( player, "Team Switching is on Cooldown", -1, 0.4, 255, 255, 255, 255, 0.15, 3.0, 0.5 )
return true
}
}
Zanieon marked this conversation as resolved.
Show resolved Hide resolved

if ( GetCurrentPlaylistVarInt( "max_teams", 0 ) > 1 && !IsFFAGame() && GamePlaying() )
SetTeam( player, GetOtherTeam( player.GetTeam() ) )
else
SendHudMessage( player, "Current gamemode doesn't support team change", -1, 0.4, 255, 255, 255, 255, 0.15, 3.0, 0.5 )

return true
}

// stuff to change later

bool function ShouldEntTakeDamage_SPMP( entity ent, var damageInfo )
Expand Down
Loading