From 07b7eafd5c1845c70510b695446c23973fed1d4d Mon Sep 17 00:00:00 2001 From: BobTheBob <32057864+BobTheBob9@users.noreply.github.com> Date: Wed, 7 Jul 2021 22:25:59 +0100 Subject: add fra, featured modes and some private lobby v2 stuff --- Northstar.Custom/scripts/vscripts/gamemodes/_gamemode_gg.gnut | 2 ++ .../scripts/vscripts/gamemodes/sh_gamemode_ctf_comp.gnut | 5 +++++ .../scripts/vscripts/gamemodes/sh_gamemode_fastball.gnut | 2 ++ .../scripts/vscripts/gamemodes/sh_gamemode_gg.gnut | 1 + .../scripts/vscripts/gamemodes/sh_gamemode_inf.gnut | 2 ++ .../scripts/vscripts/gamemodes/sh_gamemode_kr.gnut | 2 ++ .../scripts/vscripts/gamemodes/sh_gamemode_tt.gnut | 2 ++ .../vscripts/lobby/sh_private_lobby_custom_modes_init.gnut | 11 +++++++++++ 8 files changed, 27 insertions(+) create mode 100644 Northstar.Custom/scripts/vscripts/lobby/sh_private_lobby_custom_modes_init.gnut (limited to 'Northstar.Custom/scripts') diff --git a/Northstar.Custom/scripts/vscripts/gamemodes/_gamemode_gg.gnut b/Northstar.Custom/scripts/vscripts/gamemodes/_gamemode_gg.gnut index fd41236c..99a5ccf7 100644 --- a/Northstar.Custom/scripts/vscripts/gamemodes/_gamemode_gg.gnut +++ b/Northstar.Custom/scripts/vscripts/gamemodes/_gamemode_gg.gnut @@ -73,6 +73,8 @@ void function OnPlayerKilled( entity victim, entity attacker, var damageInfo ) void function UpdateLoadout( entity player ) { + // todo: honestly, this should be reworked to use PilotLoadoutDefs instead of directly modifying weapons and shit + int currentWeaponIndex = GameRules_GetTeamScore( player.GetTeam() ) array weapons = GetGunGameWeapons() diff --git a/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_ctf_comp.gnut b/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_ctf_comp.gnut index aff693c7..1a1ce645 100644 --- a/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_ctf_comp.gnut +++ b/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_ctf_comp.gnut @@ -25,6 +25,8 @@ void function CreateGamemodeCTFComp() GameMode_AddScoreboardColumnData( GAMEMODE_CTF_COMP, "#SCOREBOARD_TITAN_DAMAGE", PGS_DISTANCE_SCORE, 6 ) // gotta use a weird pgs here since we're running out of them lol GameMode_SetColor( GAMEMODE_CTF_COMP, [61, 117, 193, 255] ) + AddPrivateMatchMode( GAMEMODE_CTF_COMP ) // add to private lobby modes + // this gamemode is literally just normal ctf + a few extra settings // as such we do all the inits in this file, not enough logic to be worth splitting it up @@ -46,6 +48,9 @@ void function CreateGamemodeCTFComp() void function CTFCompRegisterNetworkVars() { + if ( GAMETYPE != GAMEMODE_CTF_COMP ) + return + // copied from the vanilla ctf remote functions RegisterNetworkedVariable( "imcFlag", SNDC_GLOBAL, SNVT_ENTITY ) RegisterNetworkedVariable( "milFlag", SNDC_GLOBAL, SNVT_ENTITY ) diff --git a/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_fastball.gnut b/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_fastball.gnut index 734e24ce..2462d537 100644 --- a/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_fastball.gnut +++ b/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_fastball.gnut @@ -22,6 +22,8 @@ void function CreateGamemodeFastball() GameMode_AddScoreboardColumnData( GAMEMODE_FASTBALL, "#SCOREBOARD_DEATHS", PGS_DEATHS, 2 ) GameMode_SetColor( GAMEMODE_FASTBALL, [147, 204, 57, 255] ) + AddPrivateMatchMode( GAMEMODE_FASTBALL ) // add to private lobby modes + #if SERVER GameMode_AddServerInit( GAMEMODE_FASTBALL, GamemodeFastball_Init ) GameMode_SetPilotSpawnpointsRatingFunc( GAMEMODE_FASTBALL, RateSpawnpoints_Generic ) diff --git a/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_gg.gnut b/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_gg.gnut index 4ea9ac20..c4021a3c 100644 --- a/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_gg.gnut +++ b/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_gg.gnut @@ -31,6 +31,7 @@ void function CreateGamemodeGG() GameMode_AddScoreboardColumnData( GAMEMODE_GG, "#SCOREBOARD_PILOT_KILLS", PGS_PILOT_KILLS, 2 ) GameMode_SetColor( GAMEMODE_GG, [147, 204, 57, 255] ) + AddPrivateMatchMode( GAMEMODE_GG ) // add to private lobby modes // setup guns diff --git a/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_inf.gnut b/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_inf.gnut index b73dc194..bcd86378 100644 --- a/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_inf.gnut +++ b/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_inf.gnut @@ -21,6 +21,8 @@ void function CreateGamemodeInfection() GameMode_AddScoreboardColumnData( GAMEMODE_INFECTION, "#SCOREBOARD_KILLS", PGS_ASSAULT_SCORE, 2 ) GameMode_SetColor( GAMEMODE_INFECTION, [147, 204, 57, 255] ) + AddPrivateMatchMode( GAMEMODE_INFECTION ) // add to private lobby modes + #if SERVER GameMode_AddServerInit( GAMEMODE_INFECTION, GamemodeInfection_Init ) GameMode_SetPilotSpawnpointsRatingFunc( GAMEMODE_INFECTION, RateSpawnpoints_Generic ) diff --git a/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_kr.gnut b/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_kr.gnut index 2a320077..7cd91de9 100644 --- a/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_kr.gnut +++ b/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_kr.gnut @@ -19,6 +19,8 @@ void function CreateGamemodeKR() GameMode_AddScoreboardColumnData( GAMEMODE_KR, "#SCOREBOARD_KR_RECORD", PGS_ASSAULT_SCORE, 2 ) GameMode_AddScoreboardColumnData( GAMEMODE_KR, "#SCOREBOARD_PILOT_KILLS", PGS_PILOT_KILLS, 2 ) GameMode_SetColor( GAMEMODE_KR, [147, 204, 57, 255] ) + + AddPrivateMatchMode( GAMEMODE_KR ) // add to private lobby modes #if SERVER GameMode_AddServerInit( GAMEMODE_KR, GamemodeKR_Init ) diff --git a/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_tt.gnut b/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_tt.gnut index 9e879843..f3fbff28 100644 --- a/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_tt.gnut +++ b/Northstar.Custom/scripts/vscripts/gamemodes/sh_gamemode_tt.gnut @@ -21,6 +21,8 @@ void function CreateGamemodeTT() GameMode_AddScoreboardColumnData( GAMEMODE_TT, "#SCOREBOARD_PILOT_KILLS", PGS_PILOT_KILLS, 2 ) GameMode_SetColor( GAMEMODE_TT, [200, 40, 40, 255] ) + AddPrivateMatchMode( GAMEMODE_TT ) // add to private lobby modes + #if SERVER GameMode_AddServerInit( GAMEMODE_TT, GamemodeTT_Init ) GameMode_SetPilotSpawnpointsRatingFunc( GAMEMODE_TT, RateSpawnpoints_Generic ) diff --git a/Northstar.Custom/scripts/vscripts/lobby/sh_private_lobby_custom_modes_init.gnut b/Northstar.Custom/scripts/vscripts/lobby/sh_private_lobby_custom_modes_init.gnut new file mode 100644 index 00000000..81c08f22 --- /dev/null +++ b/Northstar.Custom/scripts/vscripts/lobby/sh_private_lobby_custom_modes_init.gnut @@ -0,0 +1,11 @@ +global function CustomPrivateMatchModesInit + +void function CustomPrivateMatchModesInit() +{ + // modes + AddPrivateMatchMode( "gg" ) + AddPrivateMatchMode( "inf" ) + AddPrivateMatchMode( "kr" ) + AddPrivateMatchMode( "tt" ) + AddPrivateMatchMode( "ctf_comp" ) +} \ No newline at end of file -- cgit v1.2.3