diff options
Diffstat (limited to 'Northstar.Custom/mod/scripts')
7 files changed, 37 insertions, 18 deletions
diff --git a/Northstar.Custom/mod/scripts/vscripts/_northstar_devcommands.gnut b/Northstar.Custom/mod/scripts/vscripts/_northstar_devcommands.gnut index 960e619e..ac08c7b5 100644 --- a/Northstar.Custom/mod/scripts/vscripts/_northstar_devcommands.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/_northstar_devcommands.gnut @@ -6,6 +6,7 @@ void function NorthstarDevCommands_Init() AddClientCommandCallback( "noclip", ClientCommandCallbackToggleNoclip ) AddClientCommandCallback( "script", ClientCommandCallbackEvalScript ) AddClientCommandCallback( "kill", ClientCommandCallbackKill ) + AddClientCommandCallback( "explode", ClientCommandCallbackExplode ) } bool function ClientCommandCallbackToggleNoclip( entity player, array<string> args ) @@ -51,4 +52,12 @@ bool function ClientCommandCallbackKill( entity player, array<string> args ) player.Die() return true +} + +bool function ClientCommandCallbackExplode( entity player, array<string> args ) +{ + if ( IsAlive( player ) && GetConVarInt( "sv_cheats" ) == 1 ) + player.Die( null, null, { scriptType = DF_GIB } ) + + return true }
\ No newline at end of file diff --git a/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_gg.gnut b/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_gg.gnut index 8c68f554..5794260b 100644 --- a/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_gg.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_gg.gnut @@ -16,9 +16,13 @@ void function GamemodeGG_Init() AddCallback_GameStateEnter( eGameState.WinnerDetermined, OnWinnerDetermined ) - // set scorelimit if it's wrongm sort of a jank way to do it but best i've got rn - if ( GetCurrentPlaylistVarInt( "scorelimit", GetGunGameWeapons().len() ) != GetGunGameWeapons().len() ) - SetPlaylistVarOverride( "scorelimit", GetGunGameWeapons().len().tostring() ) + // set scorelimit if it's wrong, sort of a jank way to do it but best i've got rn + try + { + if ( GetCurrentPlaylistVarInt( "scorelimit", GetGunGameWeapons().len() ) != GetGunGameWeapons().len() ) + SetPlaylistVarOverride( "scorelimit", GetGunGameWeapons().len().tostring() ) + } + catch ( ex ) {} } void function OnPlayerRespawned( entity player ) diff --git a/Northstar.Custom/mod/scripts/vscripts/lobby/sh_private_lobby_custom_modes_init.gnut b/Northstar.Custom/mod/scripts/vscripts/lobby/sh_private_lobby_custom_modes_init.gnut deleted file mode 100644 index f67a274b..00000000 --- a/Northstar.Custom/mod/scripts/vscripts/lobby/sh_private_lobby_custom_modes_init.gnut +++ /dev/null @@ -1,14 +0,0 @@ -global function CustomPrivateMatchModesInit - -void function CustomPrivateMatchModesInit() -{ - // modes - AddPrivateMatchMode( "gg" ) - AddPrivateMatchMode( "inf" ) - AddPrivateMatchMode( "kr" ) - AddPrivateMatchMode( "tt" ) - AddPrivateMatchMode( "ctf_comp" ) - - // this is nonfunctional for some reason - AddPrivateMatchMap( "mp_skyway_v1" ) -}
\ No newline at end of file diff --git a/Northstar.Custom/mod/scripts/vscripts/melee/_melee_synced_human.gnut b/Northstar.Custom/mod/scripts/vscripts/melee/_melee_synced_human.gnut index 068ffcfd..2f94e759 100644 --- a/Northstar.Custom/mod/scripts/vscripts/melee/_melee_synced_human.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/melee/_melee_synced_human.gnut @@ -258,14 +258,20 @@ void function MeleeThread_PilotVsEnemy_Attacker( SyncedMelee action, entity atta if ( isAttackerRef ) { + #if MP if ( GetCurrentPlaylistVarInt( "fp_embark_enabled", 0 ) == 1 ) FirstPersonSequenceForce1P( attackerSequence, attacker ) + #endif + thread FirstPersonSequence( attackerSequence, attacker ) } else { + #if MP if ( GetCurrentPlaylistVarInt( "fp_embark_enabled", 0 ) == 1 ) FirstPersonSequenceForce1P( attackerSequence, attacker, target ) + #endif + thread FirstPersonSequence( attackerSequence, attacker, target ) } @@ -403,15 +409,19 @@ void function MeleeThread_PilotVsEnemy_Target( SyncedMelee action, entity attack if ( isAttackerRef ) { + #if MP if ( GetCurrentPlaylistVarInt( "fp_embark_enabled", 0 ) == 1 ) FirstPersonSequenceForce1P( targetSequence, target, attacker ) + #endif waitthread FirstPersonSequence( targetSequence, target, attacker ) } else { + #if MP if ( GetCurrentPlaylistVarInt( "fp_embark_enabled", 0 ) == 1 ) FirstPersonSequenceForce1P( targetSequence, target ) + #endif waitthread FirstPersonSequence( targetSequence, target ) } diff --git a/Northstar.Custom/mod/scripts/vscripts/melee/_melee_synced_titan.gnut b/Northstar.Custom/mod/scripts/vscripts/melee/_melee_synced_titan.gnut index be2e512e..d9e995f7 100644 --- a/Northstar.Custom/mod/scripts/vscripts/melee/_melee_synced_titan.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/melee/_melee_synced_titan.gnut @@ -1330,6 +1330,7 @@ void function TitanVsTitan_3p( SyncedMelee action, entity attacker, entity targe attackerBodySequence.useAnimatedRefAttachment = true + #if MP // could use FirstPersonSequenceForce1P here, but since this uses a propdynamic rather than a player, easier to do it manually if ( GetCurrentPlaylistVarInt( "fp_embark_enabled", 0 ) == 1 ) { @@ -1356,6 +1357,7 @@ void function TitanVsTitan_3p( SyncedMelee action, entity attacker, entity targe ScreenFadeFromBlack( attacker, 1.0, 0.5 ) thread Forced1PAttackerViewBodySequence( attackerBodySequence, attackerViewBodyProxy, attacker, camera ) } + #endif thread FirstPersonSequence( attackerBodySequence, attackerViewBody, attacker ) } @@ -1369,6 +1371,7 @@ void function TitanVsTitan_3p( SyncedMelee action, entity attacker, entity targe if ( isAttackerRef ) { + #if MP if ( GetCurrentPlaylistVarInt( "fp_embark_enabled", 0 ) == 1 ) { if ( attacker.IsPlayer() && !attackerDoing1PViewbodyAnim ) @@ -1377,12 +1380,14 @@ void function TitanVsTitan_3p( SyncedMelee action, entity attacker, entity targe if ( target.IsPlayer() ) FirstPersonSequenceForce1P( targetSequence, target, attacker ) } + #endif thread FirstPersonSequence( attackerSequence, attacker ) waitthread FirstPersonSequence( targetSequence, target, attacker ) } else { + #if MP if ( GetCurrentPlaylistVarInt( "fp_embark_enabled", 0 ) == 1 ) { if ( target.IsPlayer() ) @@ -1391,6 +1396,7 @@ void function TitanVsTitan_3p( SyncedMelee action, entity attacker, entity targe if ( attacker.IsPlayer() && !attackerDoing1PViewbodyAnim ) FirstPersonSequenceForce1P( attackerSequence, attacker, target ) } + #endif thread FirstPersonSequence( targetSequence, target ) waitthread FirstPersonSequence( attackerSequence, attacker, target ) diff --git a/Northstar.Custom/mod/scripts/vscripts/rodeo/_rodeo_titan.gnut b/Northstar.Custom/mod/scripts/vscripts/rodeo/_rodeo_titan.gnut index a2ff31ae..499ca0b7 100644 --- a/Northstar.Custom/mod/scripts/vscripts/rodeo/_rodeo_titan.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/rodeo/_rodeo_titan.gnut @@ -834,7 +834,7 @@ void function TryBatteryStyleRodeo( entity rodeoPilot, entity rodeoTitan, entity } #endif - bool classicRodeo = GetCurrentPlaylistVarInt( "classic_rodeo", 0 ) == 1 + bool classicRodeo = MP && GetCurrentPlaylistVarInt( "classic_rodeo", 0 ) == 1 if ( ShouldThrowGrenadeInHatch( rodeoPilot ) ) { @@ -846,6 +846,7 @@ void function TryBatteryStyleRodeo( entity rodeoPilot, entity rodeoTitan, entity waitthread PlayerRemovesBatteryPack( rodeoPilot, rodeoTitan, titanSoul, rodeoPackage ) //This ends rodeo at the end of the sequence } + #if MP if ( classicRodeo ) { RodeoBatteryRemoval_ShowBattery( rodeoPilot ) // hide battery, will be shown at the end of a battery removal rodeo @@ -876,6 +877,7 @@ void function TryBatteryStyleRodeo( entity rodeoPilot, entity rodeoTitan, entity WaitFrame() } } + #endif } struct RodeoRiderSequenceStruct diff --git a/Northstar.Custom/mod/scripts/vscripts/titan/sh_titan_embark.gnut b/Northstar.Custom/mod/scripts/vscripts/titan/sh_titan_embark.gnut index 5a1ecd8f..4fd4d0c6 100644 --- a/Northstar.Custom/mod/scripts/vscripts/titan/sh_titan_embark.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/titan/sh_titan_embark.gnut @@ -951,8 +951,10 @@ function TitanEmbark_PlayerEmbarks( entity player, entity titan, table e ) } ) + #if MP if ( GetCurrentPlaylistVarInt( "fp_embark_enabled", 0 ) == 1 && !doFirstPersonAnim ) FirstPersonSequenceForce1P( sequence, player, titan ) + #endif thread FirstPersonSequence( sequence, player, titan ) // EmitDifferentSoundsOnEntityForPlayerAndWorld( firstPersonAudio, thirdPersonAudio, titan, player ) |