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

Unfuck the Spawns #808

Merged
merged 3 commits into from
Jul 5, 2024
Merged

Unfuck the Spawns #808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
152cc2c
Initial test
Zanieon Jul 5, 2024
a280d7d
revert some styling changes / comments to reduce diff
GeckoEidechse Jul 5, 2024
fcf8176
Re-introduce change
GeckoEidechse Jul 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
31 changes: 12 additions & 19 deletions Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ctf.nut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,27 +75,20 @@ void function RateSpawnpoints_CTF( int checkClass, array<entity> spawnpoints, in
bool function VerifyCTFSpawnpoint( entity spawnpoint, int team )
{
// ensure spawnpoints aren't too close to enemy base
vector allyFlagSpot
vector enemyFlagSpot
foreach ( entity spawn in GetEntArrayByClass_Expensive( "info_spawnpoint_flag" ) )
{
if( spawn.GetTeam() == team )
allyFlagSpot = spawn.GetOrigin()
else
enemyFlagSpot = spawn.GetOrigin()
}

if ( HasSwitchedSides() )
team = GetOtherTeam( team )

array<entity> startSpawns = SpawnPoints_GetPilotStart( team )
array<entity> enemyStartSpawns = SpawnPoints_GetPilotStart( GetOtherTeam( team ) )

vector averageFriendlySpawns
vector averageEnemySpawns

foreach ( entity spawn in startSpawns )
averageFriendlySpawns += spawn.GetOrigin()

averageFriendlySpawns /= startSpawns.len()

foreach ( entity spawn in enemyStartSpawns )
averageEnemySpawns += spawn.GetOrigin()

averageEnemySpawns /= startSpawns.len()
if( Distance2D( spawnpoint.GetOrigin(), allyFlagSpot ) > Distance2D( spawnpoint.GetOrigin(), enemyFlagSpot ) )
return false

return Distance2D( spawnpoint.GetOrigin(), averageEnemySpawns ) / Distance2D( averageFriendlySpawns, averageEnemySpawns ) > 0.35
return true
}

void function CTFInitPlayer( entity player )
Expand Down
48 changes: 19 additions & 29 deletions Northstar.CustomServers/mod/scripts/vscripts/mp/spawn.nut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ entity function FindSpawnPoint( entity player, bool isTitan, bool useStartSpawnp
{
int team = player.GetTeam()
if ( HasSwitchedSides() )
team = GetOtherTeam( team )
team = ( team == TEAM_MILITIA ) ? TEAM_IMC : TEAM_MILITIA

array<entity> spawnpoints
if ( useStartSpawnpoint )
Expand Down Expand Up @@ -181,29 +181,19 @@ entity function GetBestSpawnpoint( entity player, array<entity> spawnpoints )
foreach ( entity spawnpoint in spawnpoints )
{
if ( IsSpawnpointValid( spawnpoint, player.GetTeam() ) )
{
validSpawns.append( spawnpoint )

if ( validSpawns.len() == 3 ) // arbitrary small sample size
break
}
}

if ( validSpawns.len() == 0 )
if ( !validSpawns.len() )
{
// no valid spawns, very bad, so dont care about spawns being valid anymore
print( "found no valid spawns! spawns may be subpar!" )
foreach ( entity spawnpoint in spawnpoints )
{
validSpawns.append( spawnpoint )

if ( validSpawns.len() == 3 ) // arbitrary small sample size
break
}
}

// last resort
if ( validSpawns.len() == 0 )
if ( !validSpawns.len() )
{
print( "map has literally 0 spawnpoints, as such everything is fucked probably, attempting to use info_player_start if present" )
entity start = GetEnt( "info_player_start" )
Expand All @@ -215,7 +205,7 @@ entity function GetBestSpawnpoint( entity player, array<entity> spawnpoints )
}
}

return validSpawns[ RandomInt( validSpawns.len() ) ] // slightly randomize it
return validSpawns.getrandom() // slightly randomize it
}

bool function IsSpawnpointValid( entity spawnpoint, int team )
Expand All @@ -232,15 +222,18 @@ bool function IsSpawnpointValid( entity spawnpoint, int team )
return false
}

if( IsFFAGame() && !spawnpoint.IsVisibleToEnemies( team ) )
return true

int compareTeam = spawnpoint.GetTeam()
if ( HasSwitchedSides() && ( compareTeam == TEAM_MILITIA || compareTeam == TEAM_IMC ) )
compareTeam = GetOtherTeam( compareTeam )
if ( HasSwitchedSides() )
compareTeam = ( compareTeam == TEAM_MILITIA ) ? TEAM_IMC : TEAM_MILITIA

foreach ( bool functionref( entity, int ) customValidationRule in file.customSpawnpointValidationRules )
if ( !customValidationRule( spawnpoint, team ) )
return false

if ( spawnpoint.GetTeam() > 0 && compareTeam != team && !IsFFAGame() )
if ( spawnpoint.GetTeam() > 0 && compareTeam != team )
return false

if ( spawnpoint.IsOccupied() )
Expand All @@ -261,13 +254,12 @@ bool function IsSpawnpointValid( entity spawnpoint, int team )
return false
}

const minEnemyDist = 1000.0 // about 20 meters?
// in rsquirrel extend returns null unlike in vanilla squirrel
array< entity > spawnBlockers = GetPlayerArrayEx( "any", TEAM_ANY, TEAM_ANY, spawnpoint.GetOrigin(), minEnemyDist )
spawnBlockers.extend( GetProjectileArrayEx( "any", TEAM_ANY, TEAM_ANY, spawnpoint.GetOrigin(), minEnemyDist ) )
foreach ( entity blocker in spawnBlockers )
if ( blocker.GetTeam() != team )
return false
const minEnemyDist = 1200.0
array< entity > spawnBlockers = GetPlayerArrayEx( "any", TEAM_ANY, spawnpoint.GetTeam(), spawnpoint.GetOrigin(), minEnemyDist )
spawnBlockers.extend( GetProjectileArrayEx( "any", TEAM_ANY, spawnpoint.GetTeam(), spawnpoint.GetOrigin(), minEnemyDist ) )
spawnBlockers.extend( GetNPCArrayEx( "any", TEAM_ANY, spawnpoint.GetTeam(), spawnpoint.GetOrigin(), minEnemyDist ) )
if ( spawnBlockers.len() )
return false

// los check
return !spawnpoint.IsVisibleToEnemies( team )
Expand Down Expand Up @@ -399,11 +391,9 @@ void function InitPreferSpawnNodes()
// frontline
void function RateSpawnpoints_Frontline( int checkClass, array<entity> spawnpoints, int team, entity player )
{
float rating = RandomFloatRange( 0.0, 100.0 )
foreach ( entity spawnpoint in spawnpoints )
{
float rating = spawnpoint.CalculateFrontlineRating()
spawnpoint.CalculateRating( checkClass, player.GetTeam(), rating, rating > 0 ? rating * 0.25 : rating )
}
spawnpoint.CalculateRating( checkClass, player.GetTeam(), rating, rating )
}

// spawnzones
Expand Down
Loading