From f63ca08e4d820192b9a753d1badbe48e9671aae7 Mon Sep 17 00:00:00 2001 From: Connie Price Date: Thu, 20 Jan 2022 05:56:07 +0000 Subject: GunGame PlaylistVar Enhancements - Define GunGame weapons using playlist vars: e.g. `+setplaylistvaroverrides scorelimit 4 gg_weapon_0 -1|mp_weapon_r97|pas_run_and_gun gg_weapon_1 -1|mp_titanweapon_xo16_vanguard|arc_rounds gg_weapon_2 -1|mp_weapon_car|pas_run_and_gun gg_weapon_3 1|mp_weapon_grenade_sonar|pas_power_cell,amped_tacticals` - Now that any custom weapon lists can be synchronised using playlist vars, server callback icon handling has been removed, and icons are now handled purely clientside. - Cleaned up default weapons. Approximate structure of custom weapon list: `+setplaylistvaroverrides scorelimit gg_weapon_ ||` --- .../mod/scripts/vscripts/gamemodes/_gamemode_gg.gnut | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_gg.gnut') diff --git a/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_gg.gnut b/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_gg.gnut index 5943b8048..14f5f15d1 100644 --- a/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_gg.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_gg.gnut @@ -133,7 +133,7 @@ void function UpdateLoadout( entity player ) if ( currentWeaponIndex >= weapons.len() ) currentWeaponIndex = weapons.len() - 1 - if ( currentWeaponIndex > 18 ) // play end of game music for special weapons + if ( currentWeaponIndex > weapons.len() - 3 ) // play end of game music for special or last few weapons PlayMusicToAll( eMusicPieceID.LEVEL_LAST_MINUTE ) // this *shouldn't* overlap if done multiple times GunGameWeapon weapon = weapons[ currentWeaponIndex ] @@ -157,16 +157,6 @@ void function UpdateLoadout( entity player ) player.GiveOffhandWeapon( "melee_pilot_emptyhanded", OFFHAND_MELEE ) } - - if ( currentWeaponIndex == weapons.len() - 1 ) - { - Sv_GGEarnMeter_SetFinalIcon( player ) - - return - } - - GunGameWeapon nextWeapon = weapons[ currentWeaponIndex + 1 ] - Sv_GGEarnMeter_SetWeaponIcon( player, nextWeapon.weapon ) } void function OnWinnerDetermined() -- cgit v1.2.3