From dade102a0d4d14ba5ee560022b8e2f1ddf960977 Mon Sep 17 00:00:00 2001 From: BobTheBob <32057864+BobTheBob9@users.noreply.github.com> Date: Mon, 20 Dec 2021 21:31:33 +0000 Subject: near-release fixes --- .../mod/scripts/vscripts/gamemodes/sh_riff_instagib.gnut | 2 +- Northstar.Custom/mod/scripts/vscripts/rodeo/sh_classic_rodeo.gnut | 2 +- .../mod/scripts/vscripts/sh_3psequence_to_1p_hacks.gnut | 2 +- Northstar.Custom/mod/scripts/vscripts/sh_bleedout_damage.gnut | 6 +++--- Northstar.Custom/mod/scripts/vscripts/sh_custom_oob_timer.gnut | 2 +- Northstar.Custom/mod/scripts/vscripts/sh_promode.gnut | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'Northstar.Custom/mod') diff --git a/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_riff_instagib.gnut b/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_riff_instagib.gnut index 316893bb4..3d0dbc046 100644 --- a/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_riff_instagib.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_riff_instagib.gnut @@ -9,7 +9,7 @@ struct { void function RiffInstagib_Init() { - AddPrivateMatchModeSettingEnum( "#MODE_SETTING_CATEGORY_RIFF", "riff_instagib", [ "Disabled", "Enabled" ], "0" ) + AddPrivateMatchModeSettingEnum( "#MODE_SETTING_CATEGORY_RIFF", "riff_instagib", [ "#SETTING_DISABLED", "#SETTING_ENABLED" ], "0" ) #if SERVER if ( GetCurrentPlaylistVarInt( "riff_instagib", 0 ) == 0 ) diff --git a/Northstar.Custom/mod/scripts/vscripts/rodeo/sh_classic_rodeo.gnut b/Northstar.Custom/mod/scripts/vscripts/rodeo/sh_classic_rodeo.gnut index 038305c0a..af7f4a4d2 100644 --- a/Northstar.Custom/mod/scripts/vscripts/rodeo/sh_classic_rodeo.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/rodeo/sh_classic_rodeo.gnut @@ -10,7 +10,7 @@ const asset RODEO_WEAKPOINT_HITBOX_MODEL = $"models/Weapons/ammoboxes/backpack_s void function ClassicRodeo_InitPlaylistVars() { - AddPrivateMatchModeSettingEnum( "#MODE_SETTING_CATEGORY_TITAN", "classic_rodeo", [ "Disabled", "Enabled" ], "0" ) + AddPrivateMatchModeSettingEnum( "#MODE_SETTING_CATEGORY_TITAN", "classic_rodeo", [ "#SETTING_DISABLED", "#SETTING_ENABLED" ], "0" ) } #if SERVER diff --git a/Northstar.Custom/mod/scripts/vscripts/sh_3psequence_to_1p_hacks.gnut b/Northstar.Custom/mod/scripts/vscripts/sh_3psequence_to_1p_hacks.gnut index 202e199a8..3d7e65aa5 100644 --- a/Northstar.Custom/mod/scripts/vscripts/sh_3psequence_to_1p_hacks.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/sh_3psequence_to_1p_hacks.gnut @@ -35,7 +35,7 @@ void function FirstPersonSequenceForce1P_Init() void function FirstPersonSequenceForce1P_InitPlaylistVars() { - AddPrivateMatchModeSettingEnum( "#MODE_SETTING_CATEGORY_RIFF", "fp_embark_enabled", [ "Disabled", "Enabled" ], "0" ) + AddPrivateMatchModeSettingEnum( "#MODE_SETTING_CATEGORY_RIFF", "fp_embark_enabled", [ "#SETTING_DISABLED", "#SETTING_ENABLED" ], "0" ) } void function FirstPersonSequenceForce1P_RegisterCustomNetworkFunctions() diff --git a/Northstar.Custom/mod/scripts/vscripts/sh_bleedout_damage.gnut b/Northstar.Custom/mod/scripts/vscripts/sh_bleedout_damage.gnut index 2fd36e45a..3306d1bd6 100644 --- a/Northstar.Custom/mod/scripts/vscripts/sh_bleedout_damage.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/sh_bleedout_damage.gnut @@ -33,9 +33,9 @@ const bool DEFAULT_DEATH_ON_TEAM_BLEEDOUT = false void function BleedoutDamage_Init() { - AddPrivateMatchModeSettingEnum( "#MODE_SETTING_CATEGORY_BLEEDOUT", "riff_player_bleedout", [ "Default", "Disabled", "Enabled" ], "0" ) - AddPrivateMatchModeSettingEnum( "#MODE_SETTING_CATEGORY_BLEEDOUT", "player_bleedout_forceHolster", [ "Disabled", "Enabled" ], DEFAULT_FORCE_WEAPON_HOLSTER.tostring() ) - AddPrivateMatchModeSettingEnum( "#MODE_SETTING_CATEGORY_BLEEDOUT", "player_bleedout_forceDeathOnTeamBleedout", [ "Disabled", "Enabled" ], DEFAULT_DEATH_ON_TEAM_BLEEDOUT.tostring() ) + AddPrivateMatchModeSettingEnum( "#MODE_SETTING_CATEGORY_BLEEDOUT", "riff_player_bleedout", [ "#SETTING_DEFAULT", "#SETTING_DISABLED", "#SETTING_ENABLED" ], "0" ) + AddPrivateMatchModeSettingEnum( "#MODE_SETTING_CATEGORY_BLEEDOUT", "player_bleedout_forceHolster", [ "#SETTING_DISABLED", "#SETTING_ENABLED" ], DEFAULT_FORCE_WEAPON_HOLSTER.tostring() ) + AddPrivateMatchModeSettingEnum( "#MODE_SETTING_CATEGORY_BLEEDOUT", "player_bleedout_forceDeathOnTeamBleedout", [ "#SETTING_DISABLED", "#SETTING_ENABLED" ], DEFAULT_DEATH_ON_TEAM_BLEEDOUT.tostring() ) AddPrivateMatchModeSettingArbitrary( "#MODE_SETTING_CATEGORY_BLEEDOUT", "player_bleedout_bleedoutTime", DEFAULT_BLEEDOUT_TIME.tostring() ) AddPrivateMatchModeSettingArbitrary( "#MODE_SETTING_CATEGORY_BLEEDOUT", "player_bleedout_firstAidTime", DEFAULT_FIRSTAID_TIME.tostring() ) AddPrivateMatchModeSettingArbitrary( "#MODE_SETTING_CATEGORY_BLEEDOUT", "player_bleedout_firstAidTimeSelf", DEFAULT_FIRSTAID_TIME_SELF.tostring() ) diff --git a/Northstar.Custom/mod/scripts/vscripts/sh_custom_oob_timer.gnut b/Northstar.Custom/mod/scripts/vscripts/sh_custom_oob_timer.gnut index 9689302c1..ca6ec5ec5 100644 --- a/Northstar.Custom/mod/scripts/vscripts/sh_custom_oob_timer.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/sh_custom_oob_timer.gnut @@ -2,6 +2,6 @@ global function CustomOOBTimer_Init void function CustomOOBTimer_Init() { - AddPrivateMatchModeSettingEnum( "#MODE_SETTING_CATEGORY_MATCH", "oob_timer_enabled", [ "Disabled", "Enabled" ], "1" ) + AddPrivateMatchModeSettingEnum( "#MODE_SETTING_CATEGORY_MATCH", "oob_timer_enabled", [ "#SETTING_DISABLED", "#SETTING_ENABLED" ], "1" ) level.disableOutOfBounds <- GetCurrentPlaylistVarInt( "oob_timer_enabled", 1 ) == 0 } \ No newline at end of file diff --git a/Northstar.Custom/mod/scripts/vscripts/sh_promode.gnut b/Northstar.Custom/mod/scripts/vscripts/sh_promode.gnut index f390fed60..1572ccfa8 100644 --- a/Northstar.Custom/mod/scripts/vscripts/sh_promode.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/sh_promode.gnut @@ -4,7 +4,7 @@ global function PromodeEnabled void function Promode_Init() { - AddPrivateMatchModeSettingEnum( "#MODE_SETTING_CATEGORY_PROMODE", "promode_enable", [ "Disabled", "Enabled" ], "0" ) + AddPrivateMatchModeSettingEnum( "#MODE_SETTING_CATEGORY_PROMODE", "promode_enable", [ "#SETTING_DISABLED", "#SETTING_ENABLED" ], "0" ) #if SERVER AddCallback_OnPlayerRespawned( GivePromodeWeaponMod ) -- cgit v1.2.3