From bd9cfac5499a76b0a952af2363110e3db44b3178 Mon Sep 17 00:00:00 2001 From: Coopyy Date: Mon, 17 Jan 2022 14:38:27 -0600 Subject: Added Sticks & Stones Configuration as Playlist Vars (#115) * added mode config options in menu --- Northstar.Custom/keyvalues/playlists_v2.txt | 9 +++------ Northstar.Custom/mod.json | 2 +- .../mod/scripts/vscripts/gamemodes/_gamemode_sns.gnut | 17 ++++++++++++----- .../mod/scripts/vscripts/gamemodes/sh_gamemode_sns.gnut | 6 ++++++ 4 files changed, 22 insertions(+), 12 deletions(-) (limited to 'Northstar.Custom') diff --git a/Northstar.Custom/keyvalues/playlists_v2.txt b/Northstar.Custom/keyvalues/playlists_v2.txt index 1a7875579..bd2a58fee 100644 --- a/Northstar.Custom/keyvalues/playlists_v2.txt +++ b/Northstar.Custom/keyvalues/playlists_v2.txt @@ -271,7 +271,7 @@ playlists image ffa at_turrets_enabled 0 max_players 16 - max_teams 20 + max_teams 16 scorelimit 300 classic_mp 1 @@ -868,11 +868,6 @@ playlists hint #PL_sns_desc abbreviation #PL_sns_abbr image ps - max_players 16 - max_teams 20 - scorelimit 300 - classic_mp 1 - mixtape_timeout 120 visible 0 gamemode_score_hint #GAMEMODE_SCORE_HINT_FFA @@ -904,6 +899,8 @@ playlists mp_relic02 1 mp_wargames 1 mp_rise 1 + mp_coliseum 1 + mp_coliseum_column 1 } } } diff --git a/Northstar.Custom/mod.json b/Northstar.Custom/mod.json index 0bf473da7..fa7a8730c 100644 --- a/Northstar.Custom/mod.json +++ b/Northstar.Custom/mod.json @@ -123,7 +123,7 @@ }, { "Path": "gamemodes/gg_earn_meter/sh_gg_earn_meter.gnut", - "RunOn": "( CLIENT || SERVER ) && MP", + "RunOn": "( CLIENT || SERVER ) && MP" }, { "Path": "gamemodes/gg_earn_meter/_gg_earn_meter.gnut", diff --git a/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_sns.gnut b/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_sns.gnut index f3b7d2eee..98bb06b90 100644 --- a/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_sns.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_sns.gnut @@ -4,17 +4,18 @@ struct { string score_leader_highlight = "enemy_boss_bounty" // highlight effect applied to person in 1st place string offhand_weapon = "mp_weapon_thermite_grenade" // offhand weapon - bool reset_pulse_blade_cooldown_on_pulse_blade_kill = true + bool reset_pulse_blade_cooldown_on_pulse_blade_kill - int wme_kill_value = 10 - int offhand_kill_value = 10 - int reset_kill_value = 5 - int melee_kill_value = 5 + int wme_kill_value + int offhand_kill_value + int reset_kill_value + int melee_kill_value } file void function SNS_Init() { + SetSpawnpointGamemodeOverride( FFA ) SetShouldUseRoundWinningKillReplay( true ) ClassicMP_ForceDisableEpilogue( true ) SetLoadoutGracePeriodEnabled( false ) // prevent modifying loadouts with grace period @@ -25,6 +26,12 @@ void function SNS_Init() AddCallback_OnPlayerKilled( OnPlayerKilled ) AddCallback_OnPlayerRespawned( OnPlayerRespawned ) AddCallback_GameStateEnter( eGameState.WinnerDetermined, OnWinnerDetermined ) + + file.reset_pulse_blade_cooldown_on_pulse_blade_kill = GetCurrentPlaylistVarInt( "reset_pulse_blade_cooldown_on_pulse_blade_kill", 1 ) == 1 + file.wme_kill_value = GetCurrentPlaylistVarInt( "wme_kill_value", 10 ) + file.offhand_kill_value = GetCurrentPlaylistVarInt( "offhand_kill_value", 10 ) + file.reset_kill_value = GetCurrentPlaylistVarInt( "reset_kill_value", 5 ) + file.melee_kill_value = GetCurrentPlaylistVarInt( "melee_kill_value", 5 ) } void function OnPlayerKilled( entity victim, entity attacker, var damageInfo ) diff --git a/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_gamemode_sns.gnut b/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_gamemode_sns.gnut index b3d2c2da3..e0f26b94e 100644 --- a/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_gamemode_sns.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_gamemode_sns.gnut @@ -24,6 +24,12 @@ void function CreateGamemodeSNS() AddPrivateMatchMode( GAMEMODE_SNS ) // add to private lobby modes + AddPrivateMatchModeSettingArbitrary( "#PL_sns", "wme_kill_value", "10" ) + AddPrivateMatchModeSettingArbitrary( "#PL_sns", "offhand_kill_value", "10" ) + AddPrivateMatchModeSettingArbitrary( "#PL_sns", "reset_kill_value", "5" ) + AddPrivateMatchModeSettingArbitrary( "#PL_sns", "melee_kill_value", "5" ) + AddPrivateMatchModeSettingEnum( "#PL_sns", "reset_pulse_blade_cooldown_on_pulse_blade_kill", [ "Disabled", "Enabled" ], "1" ) + GameMode_SetDefaultScoreLimits( GAMEMODE_SNS, 300, 0 ) #if SERVER -- cgit v1.2.3 From 4c2bf1f7519d1164ea66c806f3c0a056f53c87a5 Mon Sep 17 00:00:00 2001 From: Connie Price Date: Sun, 16 Jan 2022 21:57:00 +0000 Subject: Fixed using boosts with primary equipped melee weapons. --- Northstar.Custom/mod/scripts/vscripts/burnmeter/sh_burnmeter.gnut | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Northstar.Custom') diff --git a/Northstar.Custom/mod/scripts/vscripts/burnmeter/sh_burnmeter.gnut b/Northstar.Custom/mod/scripts/vscripts/burnmeter/sh_burnmeter.gnut index 4705ef644..ac9ffab37 100644 --- a/Northstar.Custom/mod/scripts/vscripts/burnmeter/sh_burnmeter.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/burnmeter/sh_burnmeter.gnut @@ -168,11 +168,11 @@ BurnReward function BurnReward_GetById( int id ) BurnReward function BurnReward_GetByRef( string ref ) { Assert( ref in burn.burnRewards ) - + // more hacks for arena if ( !( ref in burn.burnRewards ) && GetCurrentPlaylistVarString( "boost_store_mode", "off" ) == "arena" ) return GetArenaLoadoutItemAsBurnReward( ref ) - + return burn.burnRewards[ref] } @@ -381,7 +381,8 @@ bool function OnWeaponAttemptOffhandSwitch_burncardweapon( entity weapon ) entity ownerPlayer = weapon.GetWeaponOwner() Assert( ownerPlayer.IsPlayer() ) - if ( ownerPlayer.IsUsingOffhandWeapon() ) + entity activeWeapon = ownerPlayer.GetActiveWeapon() + if ( ownerPlayer.IsUsingOffhandWeapon() && !( activeWeapon.GetWeaponInfoFileKeyField( "fire_mode" ) == "offhand_melee" && activeWeapon.IsReadyToFire() ) ) return false if ( weapon.HasMod( "burn_card_weapon_mod" ) ) -- cgit v1.2.3 From 190349255d45ae88f7b6d2ad872a5df15699d97a Mon Sep 17 00:00:00 2001 From: x3Karma Date: Wed, 19 Jan 2022 00:59:42 +0800 Subject: Remove sv_cheats condition from kill and explode Short little edit on mobile. Main reasons is to make it more similar to community interactions in Team Fortress 2 where players killbind themselves for seemingly no reason. (It's funny) --- Northstar.Custom/mod/scripts/vscripts/_northstar_devcommands.gnut | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Northstar.Custom') diff --git a/Northstar.Custom/mod/scripts/vscripts/_northstar_devcommands.gnut b/Northstar.Custom/mod/scripts/vscripts/_northstar_devcommands.gnut index e629e5aea..850855a0f 100644 --- a/Northstar.Custom/mod/scripts/vscripts/_northstar_devcommands.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/_northstar_devcommands.gnut @@ -23,7 +23,7 @@ bool function ClientCommandCallbackToggleNoclip( entity player, array ar bool function ClientCommandCallbackKill( entity player, array args ) { - if ( IsAlive( player ) && GetConVarInt( "sv_cheats" ) == 1 ) + if ( IsAlive( player ) ) player.Die() return true @@ -31,8 +31,8 @@ bool function ClientCommandCallbackKill( entity player, array args ) bool function ClientCommandCallbackExplode( entity player, array args ) { - if ( IsAlive( player ) && GetConVarInt( "sv_cheats" ) == 1 ) + if ( IsAlive( player ) ) player.Die( null, null, { scriptType = DF_GIB } ) return true -} \ No newline at end of file +} -- cgit v1.2.3