diff options
| author | Remy Raes <raes.remy@gmail.com> | 2021-12-25 23:45:33 +0100 |
|---|---|---|
| committer | Remy Raes <raes.remy@gmail.com> | 2021-12-25 23:45:33 +0100 |
| commit | 2dbabfcfbccb83a629a747f33ccef21889349138 (patch) | |
| tree | 24d7176507553af7ac03ac54093a803a8ad06eff /Northstar.CustomServers/mod/scripts/vscripts/mp | |
| parent | e93893cc0083c94044048f920a34fb46bc448b9a (diff) | |
| parent | e4faa247edaf389d4d52e3a3129af540bb19a0ac (diff) | |
| download | NorthstarMods-2dbabfcfbccb83a629a747f33ccef21889349138.tar.gz NorthstarMods-2dbabfcfbccb83a629a747f33ccef21889349138.zip | |
Merge branch 'main' into chore/french-translations
Diffstat (limited to 'Northstar.CustomServers/mod/scripts/vscripts/mp')
| -rw-r--r-- | Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut | 3 | ||||
| -rw-r--r-- | Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut b/Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut index 4b90b1a2..562f65e5 100644 --- a/Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut +++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut @@ -80,6 +80,9 @@ void function PIN_GameStart() void function SetGameState( int newState ) { + if ( newState == GetGameState() ) + return + SetServerVar( "gameStateChangeTime", Time() ) SetServerVar( "gameState", newState ) svGlobal.levelEnt.Signal( "GameStateChanged" ) diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut b/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut index 108909a3..119b1712 100644 --- a/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut +++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut @@ -213,7 +213,7 @@ void function ScoreEvent_SetupEarnMeterValuesForMixedModes() // mixed modes in t { // todo needs earn/overdrive values // player-controlled stuff - ScoreEvent_SetEarnMeterValues( "KillPilot", 0.7, 0.15 ) + ScoreEvent_SetEarnMeterValues( "KillPilot", 0.07, 0.15 ) ScoreEvent_SetEarnMeterValues( "KillTitan", 0.0, 0.15 ) ScoreEvent_SetEarnMeterValues( "TitanKillTitan", 0.0, 0.0 ) // unsure ScoreEvent_SetEarnMeterValues( "PilotBatteryStolen", 0.0, 0.35 ) // this actually just doesn't have overdrive in vanilla even |