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.

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

Fix Titan Assist not tracking properly #744

Merged
merged 21 commits into from
Oct 18, 2023
Merged
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
341f3ac
Keep store items unlocked with progression enabled
Zanieon Sep 29, 2023
a1ea16b
Add Aegis Rank reset functionality
Zanieon Sep 29, 2023
824d914
Revert "Add Aegis Rank reset functionality"
Zanieon Sep 29, 2023
643d7d6
Space'y
Zanieon Sep 29, 2023
1bc8e0d
Trigger workflows
ASpoonPlaysGames Oct 1, 2023
db4204b
Merge branch 'R2Northstar:main' into progression_improvements
Zanieon Oct 3, 2023
4d69f31
Merge branch 'main' into progression_improvements
uniboi Oct 6, 2023
d900813
Merge branch 'main' into progression_improvements
Zanieon Oct 7, 2023
f1b8c82
Merge branch 'R2Northstar:main' into progression_improvements
Zanieon Oct 9, 2023
ba4be96
Merge branch 'R2Northstar:main' into progression_improvements
Zanieon Oct 10, 2023
6ddce42
Merge branch 'main' into progression_improvements
Zanieon Oct 10, 2023
70b6b75
Merge branch 'R2Northstar:main' into progression_improvements
Zanieon Oct 11, 2023
60f779e
Expose third string var
Zanieon Oct 11, 2023
d0be573
Merge branch 'main' into progression_improvements
Zanieon Oct 12, 2023
55f45ec
Better naming of extra arg
Zanieon Oct 12, 2023
b48e231
Fix passing of wrong arg name
Zanieon Oct 12, 2023
60e373f
Merge branch 'R2Northstar:main' into progression_improvements
Zanieon Oct 12, 2023
fe58bc1
Fix Titan Assist medal not tracking properly
Zanieon Oct 13, 2023
4ae54d6
Remove stat tracking from medal code
Zanieon Oct 14, 2023
c22bef6
Merge branch 'main' into maintenance_main
Zanieon Oct 16, 2023
1bc65e8
Merge branch 'main' into maintenance_main
Zanieon Oct 18, 2023
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
25 changes: 15 additions & 10 deletions Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut
Original file line number Diff line number Diff line change
Expand Up @@ -202,18 +202,23 @@ void function ScoreEvent_TitanKilled( entity victim, entity attacker, var damage
AddPlayerScore( attacker, "KillTitan" )
}

table<int, bool> alreadyAssisted
foreach( DamageHistoryStruct attackerInfo in victim.e.recentDamageHistory )
entity soul = victim.GetTitanSoul()
if ( IsValid( soul ) )
{
if ( !IsValid( attackerInfo.attacker ) || !attackerInfo.attacker.IsPlayer() || attackerInfo.attacker == victim )
continue

bool exists = attackerInfo.attacker.GetEncodedEHandle() in alreadyAssisted ? true : false
if( attackerInfo.attacker != attacker && !exists )
table<int, bool> alreadyAssisted

foreach( DamageHistoryStruct attackerInfo in soul.e.recentDamageHistory )
{
alreadyAssisted[attackerInfo.attacker.GetEncodedEHandle()] <- true
AddPlayerScore(attackerInfo.attacker, "TitanAssist" )
Remote_CallFunction_NonReplay( attackerInfo.attacker, "ServerCallback_SetAssistInformation", attackerInfo.damageSourceId, attacker.GetEncodedEHandle(), victim.GetEncodedEHandle(), attackerInfo.time )
if ( !IsValid( attackerInfo.attacker ) || !attackerInfo.attacker.IsPlayer() || attackerInfo.attacker == soul )
continue

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(), soul.GetEncodedEHandle(), attackerInfo.time )
}
}
}

Expand Down
Loading