Merge pull request #96 from VITALISED/scoring

Add assist medals and scoring

4 files changed, 63 insertions, 4 deletions

diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ps.nut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ps.nut
index 94aff34a8..a02b9072e 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ps.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ps.nut
@@ -32,6 +32,18 @@ void function GiveScoreForPlayerKill( entity victim, entity attacker, var damage
 {

 	if ( victim != attacker && victim.IsPlayer() && attacker.IsPlayer() && GetGameState() == eGameState.Playing )

 		AddTeamScore( attacker.GetTeam(), 1 )

+

+	table<int, bool> alreadyAssisted

+	foreach( DamageHistoryStruct attackerInfo in victim.e.recentDamageHistory )

+	{

+		bool exists = attackerInfo.attacker.GetEncodedEHandle() in alreadyAssisted ? true : false

+		if( attackerInfo.attacker != attacker && !exists )

+		{

+			alreadyAssisted[attackerInfo.attacker.GetEncodedEHandle()] <- true

+			attackerInfo.attacker.AddToPlayerGameStat( PGS_ASSISTS, 1 )

+		}

+	}

+

 }

 

 int function CheckScoreForDraw()

diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_tdm.nut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_tdm.nut
index 5a7b7d771..a3ea51725 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_tdm.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_tdm.nut
@@ -12,6 +12,26 @@ void function GiveScoreForPlayerKill( entity victim, entity attacker, var damage
 {

 	if ( victim != attacker && victim.IsPlayer() && attacker.IsPlayer() && GetGameState() == eGameState.Playing )

 		AddTeamScore( attacker.GetTeam(), 1 )

+

+	table<int, bool> alreadyAssisted

+	foreach( DamageHistoryStruct attackerInfo in victim.e.recentDamageHistory )

+	{

+		bool exists = attackerInfo.attacker.GetEncodedEHandle() in alreadyAssisted ? true : false

+		if( attackerInfo.attacker != attacker && !exists )

+		{

+			alreadyAssisted[attackerInfo.attacker.GetEncodedEHandle()] <- true

+			attackerInfo.attacker.AddToPlayerGameStat( PGS_ASSISTS, 1 )

+		}

+	}

+		// 	try 

+		// {

+		// 	if( attackerInfo.attacker != attacker && !alreadyAssisted[attackerInfo.attacker.GetEncodedEHandle()] )

+		// 	{

+		// 		alreadyAssisted[attackerInfo.attacker.GetEncodedEHandle()] <- true

+		// 		attackerInfo.attacker.AddToPlayerGameStat( PGS_ASSISTS, 1 )

+		// 	}

+		// } catch ( ex )

+		// print( "Exception found in assist, ignoring: " + ex)

 }

 

 void function RateSpawnpoints_Directional( int checkclass, array<entity> spawnpoints, int team, entity player )

@@ -22,9 +42,9 @@ void function RateSpawnpoints_Directional( int checkclass, array<entity> spawnpo
 

 int function CheckScoreForDraw()

 {

-	if (GameRules_GetTeamScore(TEAM_IMC) > GameRules_GetTeamScore(TEAM_MILITIA))

+	if ( GameRules_GetTeamScore( TEAM_IMC ) > GameRules_GetTeamScore( TEAM_MILITIA ) )

 		return TEAM_IMC

-	else if (GameRules_GetTeamScore(TEAM_MILITIA) > GameRules_GetTeamScore(TEAM_IMC))

+	else if ( GameRules_GetTeamScore( TEAM_MILITIA ) > GameRules_GetTeamScore( TEAM_IMC ) )

 		return TEAM_MILITIA

 

 	return TEAM_UNASSIGNED

diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/_base_gametype_mp.gnut b/Northstar.CustomServers/mod/scripts/vscripts/mp/_base_gametype_mp.gnut
index 4b2e539cf..b169de632 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/mp/_base_gametype_mp.gnut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/_base_gametype_mp.gnut
@@ -222,7 +222,7 @@ void function CodeCallback_OnPlayerRespawned( entity player )
 	player.SetPredictionEnabled( true )
 	Loadouts_TryGivePilotLoadout( player )
 	SetHumanRagdollImpactTable( player )
-	ClearLastAttacker( player ) // so dying to anything doesn't credit the same attacker after respawning
+ 	ClearLastAttacker( player ) // so dying to anything doesn't credit the same attacker after respawning
 	
 	foreach ( entity weapon in player.GetMainWeapons() )
 		weapon.SetProScreenOwner( player )
@@ -277,9 +277,24 @@ void function PostDeathThread_MP( entity player, var damageInfo ) // based on ga
 		player.s.inPostDeath = false
 	})
 
+
 	entity attacker = DamageInfo_GetAttacker( damageInfo )
 	int methodOfDeath = DamageInfo_GetDamageSourceIdentifier( damageInfo )
 
+	table<int, bool> alreadyAssisted
+	foreach( DamageHistoryStruct attackerInfo in player.e.recentDamageHistory )
+	{
+		bool exists = attackerInfo.attacker.GetEncodedEHandle() in alreadyAssisted ? true : false
+		if( attackerInfo.attacker != attacker && !exists )
+		{
+			alreadyAssisted[attackerInfo.attacker.GetEncodedEHandle()] <- true
+			Remote_CallFunction_NonReplay( attackerInfo.attacker, "ServerCallback_SetAssistInformation", attackerInfo.damageSourceId, attacker.GetEncodedEHandle(), player.GetEncodedEHandle(), attackerInfo.time ) 
+			AddPlayerScore(attackerInfo.attacker, "PilotAssist" )
+		}
+
+
+	}
+
 	player.p.rematchOrigin = player.p.deathOrigin
 	if ( IsValid( attacker ) && methodOfDeath == eDamageSourceId.titan_execution )
 	{
@@ -414,7 +429,7 @@ void function RespawnAsTitan( entity player, bool manualPosition = false )
 	player.isSpawning = true
 	entity spawnpoint = FindSpawnPoint( player, true, ( ShouldStartSpawn( player ) || Flag( "ForceStartSpawn" ) ) && !IsFFAGame() )
 
-	TitanLoadoutDef titanLoadout = GetTitanLoadoutForPlayer( player )
+ 	TitanLoadoutDef titanLoadout = GetTitanLoadoutForPlayer( player )
 	
 	asset model = GetPlayerSettingsAssetForClassName( titanLoadout.setFile, "bodymodel" )
 	Attachment warpAttach = GetAttachmentAtTimeFromModel( model, "at_hotdrop_01", "offset", spawnpoint.GetOrigin(), spawnpoint.GetAngles(), 0 )
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut b/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut
index 7b86a1d84..b7fd4d520 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut
@@ -190,6 +190,18 @@ void function ScoreEvent_TitanKilled( entity victim, entity attacker, var damage
 		AddPlayerScore( attacker, "TitanKillTitan", victim.GetTitanSoul().GetOwner() )
 	else
 		AddPlayerScore( attacker, "KillTitan", victim.GetTitanSoul().GetOwner() )
+
+	table<int, bool> alreadyAssisted
+	foreach( DamageHistoryStruct attackerInfo in victim.e.recentDamageHistory )
+	{
+		bool exists = attackerInfo.attacker.GetEncodedEHandle() in alreadyAssisted ? true : false
+		if( attackerInfo.attacker != attacker && !exists )
+		{
+			alreadyAssisted[attackerInfo.attacker.GetEncodedEHandle()] <- true
+			AddPlayerScore(attackerInfo.attacker, "TitanAssist" )
+			Remote_CallFunction_NonReplay( attackerInfo.attacker, "ServerCallback_SetAssistInformation", attackerInfo.damageSourceId, attacker.GetEncodedEHandle(), victim.GetEncodedEHandle(), attackerInfo.time ) 
+		}
+	}
 }
 
 void function ScoreEvent_NPCKilled( entity victim, entity attacker, var damageInfo )