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.

Sign up for GitHub

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

Jump to bottom

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

Enable a button to allow players to change teams #872

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
520468f
Changeteam feature
Zanieon Sep 7, 2024
4cddc1a
Buffer by time the ability to change teams
Zanieon Sep 7, 2024
d7b0678
Replicate convar, hide button on disable
Zanieon Sep 7, 2024
c4c3a78
Changes requested
Zanieon Sep 8, 2024
2fe08c9
Remove from else block
Zanieon Sep 8, 2024
4c5bf08
Update menu_ingame.nut
Zanieon Sep 8, 2024
5e93289
Formatting
Zanieon Sep 8, 2024
30e064c
Update buffer timer on click
Zanieon Sep 8, 2024
a96a9ec
Localization
Zanieon Sep 8, 2024
bf19630
Merge branch 'main' into TeamSwitchBtn
Zanieon Sep 9, 2024
2469c96
Merge branch 'R2Northstar:main' into TeamSwitchBtn
Zanieon Sep 10, 2024
a688a68
Merge branch 'main' into TeamSwitchBtn
Alystrasz Sep 10, 2024
3c36655
Merge branch 'main' into TeamSwitchBtn
Alystrasz Sep 11, 2024
b0f52ab
Update _base_gametype_mp.gnut
Zanieon Sep 11, 2024
d75718e
Merge branch 'R2Northstar:main' into TeamSwitchBtn
Zanieon Sep 13, 2024
b52bca8
Update menu_ingame.nut
Zanieon Sep 13, 2024
49d03f3
Merge branch 'R2Northstar:main' into TeamSwitchBtn
Zanieon Oct 3, 2024
28b363b
Merge branch 'main' into TeamSwitchBtn
Zanieon Oct 23, 2024
0873e03
Include Spectators to not be allowed to switch
Zanieon Oct 30, 2024
95a1ea6
Merge branch 'main' into TeamSwitchBtn
Alystrasz Nov 2, 2024
f483654
Merge branch 'main' into TeamSwitchBtn
Zanieon Nov 5, 2024
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
16 changes: 12 additions & 4 deletions Northstar.Client/mod/scripts/vscripts/ui/menu_ingame.nut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,12 @@ 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

if ( GetConVarBool( "ns_allow_team_change" ) )
Zanieon marked this conversation as resolved.
Show resolved Hide resolved
{
var devButton = AddComboButton( comboStruct, headerIndex, buttonIndex++, "#SWITCH_TEAMS" )
Zanieon marked this conversation as resolved.
Show resolved Hide resolved
Zanieon marked this conversation as resolved.
Show resolved Hide resolved
Hud_AddEventHandler( devButton, UIE_CLICK, OnRequestTeamSwitch )
}

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

void function OnRequestTeamSwitch( var button )
{
ClientCommand( "changeteam" )
CloseAllMenus()
}
5 changes: 5 additions & 0 deletions Northstar.CustomServers/mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@
"Name": "ns_progression_enabled",
"DefaultValue": "0",
"Flags": "ARCHIVE_PLAYERPROFILE"
},
{
"Name": "ns_allow_team_change",
"DefaultValue": "1",
"Flags": "REPLICATED"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know spoon wanted this ( and I agree with it ) but would be great to know version compat of this change before release

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would be up to @GeckoEidechse when he does a release with this change right?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have the capacity to test that atm. If someone could take care of that, that would great.
It can be tested without making a release.

Basically testing should cover

  • New server <-> Old Client
  • Old server <-> New Client

And on that note

  • New server with old client not working is a non-issue as we can just version gate
  • Old server with new client would suck as servers don't update that fast. We could still do it though, just need to ping server hosts.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New Clients to Old Servers won't change anything, the server will recieve the command from the button but ignore it.

New Servers to Old Clients will also not change anything substantial besides old clients having to type "changeteam" in console in order to swap.

}
],
"Scripts": [
Expand Down
23 changes: 23 additions & 0 deletions Northstar.CustomServers/mod/scripts/vscripts/mp/_base_gametype_mp.gnut
View file
Open in desktop
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,27 @@ void function SetRecalculateRespawnAsTitanStartPointCallback( entity functionref
file.recalculateRespawnAsTitanStartPointCallback = callbackFunc
}

bool function ClientCommandCallbackChangeTeam( entity player, array<string> args )
{
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