diff options
| author | DBmaoha <56738369+DBmaoha@users.noreply.github.com> | 2022-10-22 02:49:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-21 19:49:23 +0100 |
| commit | 133aa4c4d1559b680cc043fdfe9c4dafb5d486f8 (patch) | |
| tree | 5d0c0d8d057f81b202f8781795b849d299f6004d /Northstar.CustomServers | |
| parent | 89814b24cbdc7cd9a9ba07acae08570b4d188dfe (diff) | |
| download | NorthstarMods-133aa4c4d1559b680cc043fdfe9c4dafb5d486f8.tar.gz NorthstarMods-133aa4c4d1559b680cc043fdfe9c4dafb5d486f8.zip | |
Added Callsign Event for Core Earned And Titan Kill (#495)
* Added Callsign Event to Core Earned and Titan Kill
Callsign event from vanilla
* No Associate Entity for NPC Titan Kill
* Added Check to Player Titans
Diffstat (limited to 'Northstar.CustomServers')
| -rw-r--r-- | Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut | 14 | ||||
| -rw-r--r-- | Northstar.CustomServers/mod/scripts/vscripts/titan/_titan_health.gnut | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut b/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut index 2d1ff0745..457b2c9f1 100644 --- a/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut +++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut @@ -187,9 +187,19 @@ void function ScoreEvent_TitanKilled( entity victim, entity attacker, var damage return if ( attacker.IsTitan() ) - AddPlayerScore( attacker, "TitanKillTitan", victim.GetTitanSoul().GetOwner() ) + { + if( victim.GetBossPlayer() || victim.IsPlayer() ) // to confirm this is a pet titan or player titan + AddPlayerScore( attacker, "TitanKillTitan", attacker ) // this will show the "Titan Kill" callsign event + else + AddPlayerScore( attacker, "TitanKillTitan" ) + } else - AddPlayerScore( attacker, "KillTitan", victim.GetTitanSoul().GetOwner() ) + { + if( victim.GetBossPlayer() || victim.IsPlayer() ) + AddPlayerScore( attacker, "KillTitan", attacker ) + else + AddPlayerScore( attacker, "KillTitan" ) + } table<int, bool> alreadyAssisted foreach( DamageHistoryStruct attackerInfo in victim.e.recentDamageHistory ) diff --git a/Northstar.CustomServers/mod/scripts/vscripts/titan/_titan_health.gnut b/Northstar.CustomServers/mod/scripts/vscripts/titan/_titan_health.gnut index d600cb03b..396d5624a 100644 --- a/Northstar.CustomServers/mod/scripts/vscripts/titan/_titan_health.gnut +++ b/Northstar.CustomServers/mod/scripts/vscripts/titan/_titan_health.gnut @@ -1010,7 +1010,7 @@ void function AddCreditToTitanCoreBuilder( entity titan, float credit ) if ( IsValid( bossPlayer ) && !coreWasAvailable && IsCoreChargeAvailable( bossPlayer, soul ) ) { - AddPlayerScore( bossPlayer, "TitanCoreEarned" ) + AddPlayerScore( bossPlayer, "TitanCoreEarned", bossPlayer ) // this will show the "Core Earned" callsign event #if MP UpdateTitanCoreEarnedStat( bossPlayer, titan ) PIN_PlayerAbilityReady( bossPlayer, "core" ) |