aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBobTheBob <32057864+BobTheBob9@users.noreply.github.com>2022-03-11 03:30:27 +0000
committerBobTheBob <32057864+BobTheBob9@users.noreply.github.com>2022-03-11 03:30:27 +0000
commit2ad4754375ce4193d1d1ffb6b3b3db85beea25a9 (patch)
treeaf14237d7efc348b88e684c0dd56b69ca50023c4
parentdfaa2c1515665c9a4927fa3a0e6045421e0c135a (diff)
parentd9c82016bbe8108357dd7b7dd433ea96074da71f (diff)
downloadNorthstarMods-2ad4754375ce4193d1d1ffb6b3b3db85beea25a9.tar.gz
NorthstarMods-2ad4754375ce4193d1d1ffb6b3b3db85beea25a9.zip
Merge branch 'main' of https://github.com/R2Northstar/NorthstarMods
-rw-r--r--Northstar.CustomServers/mod/scripts/vscripts/mp/_base_gametype_mp.gnut2
-rw-r--r--Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut11
2 files changed, 7 insertions, 6 deletions
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 4168de30d..8d29c6126 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/mp/_base_gametype_mp.gnut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/_base_gametype_mp.gnut
@@ -291,7 +291,7 @@ void function PostDeathThread_MP( entity player, var damageInfo ) // based on ga
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.AddToPlayerGameStat( PGS_ASSISTS, 1 )
+ attackerInfo.attacker.AddToPlayerGameStat( PGS_ASSISTS, 1 )
}
}
}
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut b/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut
index 36862d8a2..2d1ff0745 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut
@@ -164,7 +164,7 @@ void function ScoreEvent_PlayerKilled( entity victim, entity attacker, var damag
else if ( attacker.s.currentTimedKillstreak == TRIPLEKILL_REQUIREMENT_KILLS )
AddPlayerScore( attacker, "TripleKill" )
else if ( attacker.s.currentTimedKillstreak >= MEGAKILL_REQUIREMENT_KILLS )
- AddPlayerScore( attacker, "MegaKill" )
+ AddPlayerScore( attacker, "MegaKill", attacker )
}
attacker.s.lastKillTime = Time()
@@ -237,12 +237,13 @@ void function ScoreEvent_SetupEarnMeterValuesForMixedModes() // mixed modes in t
ScoreEvent_SetEarnMeterValues( "PilotBatteryStolen", 0.0, 0.35 ) // this actually just doesn't have overdrive in vanilla even
ScoreEvent_SetEarnMeterValues( "Headshot", 0.0, 0.02 )
ScoreEvent_SetEarnMeterValues( "FirstStrike", 0.0, 0.05 )
+ ScoreEvent_SetEarnMeterValues( "PilotBatteryApplied", 0.0, 0.35 )
// ai
- ScoreEvent_SetEarnMeterValues( "KillGrunt", 0.0, 0.02, 0.5 )
- ScoreEvent_SetEarnMeterValues( "KillSpectre", 0.0, 0.02, 0.5 )
- ScoreEvent_SetEarnMeterValues( "LeechSpectre", 0.0, 0.02 )
- ScoreEvent_SetEarnMeterValues( "KillStalker", 0.0, 0.02, 0.5 )
+ ScoreEvent_SetEarnMeterValues( "KillGrunt", 0.02, 0.02, 0.5 )
+ ScoreEvent_SetEarnMeterValues( "KillSpectre", 0.02, 0.02, 0.5 )
+ ScoreEvent_SetEarnMeterValues( "LeechSpectre", 0.02, 0.02 )
+ ScoreEvent_SetEarnMeterValues( "KillStalker", 0.02, 0.02, 0.5 )
ScoreEvent_SetEarnMeterValues( "KillSuperSpectre", 0.0, 0.1, 0.5 )
}