2 files changed, 7 insertions, 249 deletions
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_mfd.nut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_mfd.nut
index 1c776ede..11cb71f6 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_mfd.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_mfd.nut
@@ -1,6 +1,5 @@
 untyped
 global function GamemodeMfd_Init
-global function RateSpawnpoints_Frontline
 
 struct {
 	entity imcLastMark
@@ -191,59 +190,4 @@ void function UpdateMarksForKill( entity victim, entity attacker, var damageInfo
 		if ( attacker.IsPlayer() )
 			attacker.SetPlayerGameStat( PGS_ASSAULT_SCORE, attacker.GetPlayerGameStat( PGS_ASSAULT_SCORE ) + 1 )
 	}
-}
-
-// could probably put this in spawn.nut? only here because i believe it's the main mode that uses this func
-void function RateSpawnpoints_Frontline( int checkClass, array<entity> spawnpoints, int team, entity player )
-{
-	Frontline frontline = GetFrontline( player.GetTeam() )
-
-	// heavily based on ctf spawn algo iteration 4, only changes it at the end
-	array<entity> startSpawns = SpawnPoints_GetPilotStart( team )
-	array<entity> enemyStartSpawns = SpawnPoints_GetPilotStart( GetOtherTeam( team ) )
-	array<entity> enemyPlayers = GetPlayerArrayOfTeam_Alive( team )
-	
-	// get average startspawn position and max dist between spawns
-	// could probably cache this, tbh, not like it should change outside of halftimes
-	vector averageFriendlySpawns
-	float maxFriendlySpawnDist
-	
-	foreach ( entity spawn in startSpawns )
-	{
-		foreach ( entity otherSpawn in startSpawns )
-		{
-			float dist = Distance2D( spawn.GetOrigin(), otherSpawn.GetOrigin() )
-			if ( dist > maxFriendlySpawnDist )
-				maxFriendlySpawnDist = dist
-		}
-		
-		averageFriendlySpawns += spawn.GetOrigin()
-	}
-	
-	averageFriendlySpawns /= startSpawns.len()
-	
-	// get average enemy startspawn position
-	vector averageEnemySpawns
-	
-	foreach ( entity spawn in enemyStartSpawns )
-		averageEnemySpawns += spawn.GetOrigin()
-	
-	averageEnemySpawns /= enemyStartSpawns.len()
-	
-	// from here, rate spawns
-	float baseDistance = Distance2D( averageFriendlySpawns, averageEnemySpawns )
-	float spawnIterations = ( baseDistance / maxFriendlySpawnDist ) / 2
-	
-	foreach ( entity spawn in spawnpoints )
-	{
-		// ratings should max/min out at 100 / -100
-		// start by prioritizing closer spawns, but not so much that enemies won't really affect them
-		float rating = 10 * ( 1.0 - Distance2D( averageFriendlySpawns, spawn.GetOrigin() ) / baseDistance )
-		
-		// rate based on distance to frontline, and then prefer spawns in the same dir from the frontline as the combatdir
-		rating += rating * ( 1.0 - ( Distance2D( spawn.GetOrigin(), frontline.friendlyCenter ) / baseDistance ) )
-		rating *= fabs( frontline.combatDir.y - Normalize( spawn.GetOrigin() - averageFriendlySpawns ).y )
-		
-		spawn.CalculateRating( checkClass, player.GetTeam(), rating, rating )
-	}
 }
 \ No newline at end of file
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ps.nut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ps.nut
index a02b9072..57355ad8 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ps.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ps.nut
@@ -1,6 +1,6 @@
 untyped
 global function GamemodePs_Init
-global function RateSpawnpoints_SpawnZones
+//global function RateSpawnpoints_SpawnZones
 
 struct {
 	array<entity> spawnzones
@@ -21,8 +21,10 @@ void function GamemodePs_Init()
 	SetTimeoutWinnerDecisionFunc( CheckScoreForDraw )
 
 	// spawnzone stuff
-	AddCallback_OnPlayerKilled( CheckSpawnzoneSuspiciousDeaths )
-	AddSpawnCallbackEditorClass( "trigger_multiple", "trigger_mp_spawn_zone", SpawnzoneTriggerInit )
+	SetShouldCreateMinimapSpawnZones( true )
+	
+	//AddCallback_OnPlayerKilled( CheckSpawnzoneSuspiciousDeaths )
+	//AddSpawnCallbackEditorClass( "trigger_multiple", "trigger_mp_spawn_zone", SpawnzoneTriggerInit )
 	
 	file.militiaPreviousSpawnZones = [ null, null, null ]
 	file.imcPreviousSpawnZones = [ null, null, null ]
@@ -30,20 +32,8 @@ void function GamemodePs_Init()
 
 void function GiveScoreForPlayerKill( entity victim, entity attacker, var damageInfo )
 {
-	if ( victim != attacker && victim.IsPlayer() && attacker.IsPlayer() && GetGameState() == eGameState.Playing )
+	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()
@@ -54,180 +44,4 @@ int function CheckScoreForDraw()
 		return TEAM_MILITIA
 
 	return TEAM_UNASSIGNED
-}
-
-// spawnzone logic
-void function SpawnzoneTriggerInit( entity spawnzone )
-{
-	// initialise spawnzone script vars
-	spawnzone.s.lastDeathRateCheck <- 0.0
-	spawnzone.s.numRecentSuspiciousDeaths <- 0
-	spawnzone.s.minimapObj <- null
-	
-	file.spawnzones.append( spawnzone )
-}
-
-void function SetNewSpawnzoneForTeam( int team, entity spawnzone )
-{
-	entity minimapObj = CreatePropScript( $"models/dev/empty_model.mdl", spawnzone.GetOrigin() )
-	SetTeam( minimapObj, team )	
-	minimapObj.Minimap_SetObjectScale( 100.0 / Distance2D( < 0, 0, 0 >, spawnzone.GetBoundingMaxs() ) )
-	minimapObj.Minimap_SetAlignUpright( true )
-	minimapObj.Minimap_AlwaysShow( TEAM_IMC, null )
-	minimapObj.Minimap_AlwaysShow( TEAM_MILITIA, null )
-	minimapObj.Minimap_SetHeightTracking( true )
-	minimapObj.Minimap_SetZOrder( MINIMAP_Z_OBJECT )
-	
-	if ( team == TEAM_IMC ) 
-	{
-		if ( IsValid( file.imcActiveSpawnZone ) )
-			file.imcActiveSpawnZone.s.minimapObj.Destroy()
-	
-		// update last 3 zones
-		file.imcPreviousSpawnZones[ 2 ] = file.imcPreviousSpawnZones[ 1 ]
-		file.imcPreviousSpawnZones[ 1 ] = file.imcPreviousSpawnZones[ 0 ]
-		file.imcPreviousSpawnZones[ 0 ] = file.imcActiveSpawnZone
-	
-		file.imcActiveSpawnZone = spawnzone
-		minimapObj.Minimap_SetCustomState( eMinimapObject_prop_script.SPAWNZONE_IMC )
-	}
-	else
-	{
-		if ( IsValid( file.militiaActiveSpawnZone ) )
-			file.militiaActiveSpawnZone.s.minimapObj.Destroy()
-	
-		// update last 3 zones
-		file.militiaPreviousSpawnZones[ 2 ] = file.militiaPreviousSpawnZones[ 1 ]
-		file.militiaPreviousSpawnZones[ 1 ] = file.militiaPreviousSpawnZones[ 0 ]
-		file.militiaPreviousSpawnZones[ 0 ] = file.militiaActiveSpawnZone
-	
-		file.militiaActiveSpawnZone = spawnzone
-		minimapObj.Minimap_SetCustomState( eMinimapObject_prop_script.SPAWNZONE_MIL )
-	}
-	
-	minimapObj.DisableHibernation()	
-	
-	spawnzone.s.minimapObj = minimapObj
-	spawnzone.s.lastDeathRateCheck = 0.0
-	spawnzone.s.numRecentSuspiciousDeaths = Time()
-}
-
-void function CheckSpawnzoneSuspiciousDeaths( entity victim, entity attacker, var damageInfo )
-{
-	if ( victim.s.respawnTime + 10.0 < Time() )
-		return
-
-	entity spawnzone
-	if ( victim.GetTeam() == TEAM_IMC )
-		spawnzone = file.imcActiveSpawnZone
-	else
-		spawnzone = file.militiaActiveSpawnZone
-	
-	if ( Distance2D( victim.GetOrigin(), spawnzone.GetOrigin() ) <= Distance2D( < 0, 0, 0 >, spawnzone.GetBoundingMaxs() ) * 1.2 )
-		spawnzone.s.numRecentSuspiciousDeaths++
-}
-
-entity function FindNewSpawnZone( int team )
-{
-	array<entity> startSpawns = SpawnPoints_GetPilotStart( team )
-	array<entity> enemyStartSpawns = SpawnPoints_GetPilotStart( GetOtherTeam( team ) )
-	
-	// get average friendly startspawn position
-	vector averageFriendlySpawns
-	foreach ( entity spawn in startSpawns )
-		averageFriendlySpawns += spawn.GetOrigin()
-	averageFriendlySpawns /= startSpawns.len()
-	
-	// get average enemy startspawn position
-	vector averageEnemySpawns
-	foreach ( entity spawn in enemyStartSpawns )
-		averageEnemySpawns += spawn.GetOrigin()
-	averageEnemySpawns /= enemyStartSpawns.len()
-	
-	array<entity> validZones
-	array<entity> enemyPlayers = GetPlayerArrayOfTeam( GetOtherTeam( team ) )
-	float averageFriendlySpawnDist
-	
-	foreach ( entity spawnzone in file.spawnzones )
-	{
-		if ( team == TEAM_IMC && file.imcPreviousSpawnZones.contains( spawnzone ) )
-			continue
-		else if ( file.militiaPreviousSpawnZones.contains( spawnzone ) )
-			continue
-	
-		// check if it's too far from startspawns
-		float friendlySpawnDist = Distance2D( spawnzone.GetOrigin(), averageFriendlySpawns )
-		if ( friendlySpawnDist > Distance2D( averageFriendlySpawns, averageEnemySpawns ) * 1.2 )
-			continue
-		
-		// check if it's safe atm
-		bool safe = true
-		foreach ( entity enemy in enemyPlayers )
-		{
-			if ( Distance2D( enemy.GetOrigin(), spawnzone.GetOrigin() ) < Distance2D( < 0, 0, 0 >, spawnzone.GetBoundingMaxs() ) * 1.2 )
-			{
-				safe = false
-				break
-			}
-		}
-		
-		if ( !safe )
-			continue
-		
-		averageFriendlySpawnDist += friendlySpawnDist
-		validZones.append( spawnzone )
-	}
-	
-	averageFriendlySpawnDist /= validZones.len()
-	
-	array<entity> realValidZones = clone validZones
-	foreach ( entity validzone in validZones )
-	{
-		if ( Distance2D( averageFriendlySpawns, validzone.GetOrigin() ) < averageFriendlySpawnDist * 1.4 )
-			realValidZones.append( validzone )
-	}
-	
-	entity spawnzone = realValidZones.getrandom()
-	SetNewSpawnzoneForTeam( team, spawnzone )
-		
-	return spawnzone
-}
-
-void function RateSpawnpoints_SpawnZones( int checkClass, array<entity> spawnpoints, int team, entity player )
-{
-	entity spawnzone
-	if ( player.GetTeam() == TEAM_IMC )
-		spawnzone = file.imcActiveSpawnZone
-	else
-		spawnzone = file.militiaActiveSpawnZone
-	
-	// spawnzones don't exist yet, create them now
-	if ( !IsValid( spawnzone ) )
-		spawnzone = FindNewSpawnZone( player.GetTeam() )
-	
-	// check if we should shift spawnzones
-	// if it's been more than 15 seconds since last check, reset
-	if ( spawnzone.s.lastDeathRateCheck + 15.0 < Time() )
-	{
-		spawnzone.s.numRecentSuspiciousDeaths = 0
-		spawnzone.s.lastDeathRateCheck = Time()
-	}
-	
-	// check if we've gone over the threshold for recent deaths too close to our current spawnzone
-	if ( spawnzone.s.numRecentSuspiciousDeaths >= GetPlayerArrayOfTeam( player.GetTeam() ).len() * 0.4 )
-		// over the threshold, find a new spawn zone
-		spawnzone = FindNewSpawnZone( player.GetTeam() )
-	
-	// rate spawnpoints
-	foreach ( entity spawn in spawnpoints ) 
-	{
-		float rating = 0.0
-		float distance = Distance2D( spawn.GetOrigin(), spawnzone.GetOrigin() )
-		if ( distance < Distance2D( < 0, 0, 0 >, spawnzone.GetBoundingMaxs() ) )
-			rating = 100.0
-		else // max 35 rating if not in zone, rate by closest
-			rating = 35.0 * ( 1 - ( distance / 5000.0 ) )
-			
-		spawn.CalculateRating( checkClass, player.GetTeam(), rating, rating )
-	}
-}
+}
+\ No newline at end of file