diff --git a/scripting/get5.sp b/scripting/get5.sp index bd1ea23a..c51aebbd 100644 --- a/scripting/get5.sp +++ b/scripting/get5.sp @@ -412,7 +412,7 @@ public void OnPluginStart() { g_AllowUnpausingFixedPausesCvar = CreateConVar("get5_allow_unpausing_fixed_pauses", "1", "Whether fixed-length tactical pauses can be stopped early if both teams !unpause."); g_AutoTechPauseMissingPlayersCvar = CreateConVar("get5_auto_tech_pause_missing_players", "0", "The number of players that must leave a team to trigger an automatic technical pause. Set to 0 to disable."); g_FixedPauseTimeCvar = CreateConVar("get5_fixed_pause_time", "60", "The fixed duration of tactical pauses in seconds. Cannot be set lower than 15 if non-zero."); - g_MaxTacticalPausesCvar = CreateConVar("get5_max_pauses", "0", "Number of tactical pauses a team can use. 0 = unlimited."); + g_MaxTacticalPausesCvar = CreateConVar("get5_max_pauses", "4", "Number of tactical pauses a team can use. 0 = unlimited."); g_MaxPauseTimeCvar = CreateConVar("get5_max_pause_time", "0", "Maximum number of seconds a game can spend under tactical pause for each team. 0 = unlimited."); g_MaxTechPausesCvar = CreateConVar("get5_max_tech_pauses", "0", "Number of technical pauses a team can use. 0 = unlimited."); g_PausingEnabledCvar = CreateConVar("get5_pausing_enabled", "1", "Whether tactical pauses are allowed by players."); @@ -420,7 +420,7 @@ public void OnPluginStart() { g_MaxTechPauseDurationCvar = CreateConVar("get5_tech_pause_time", "0", "Number of seconds before anyone can call !unpause during a technical timeout. 0 = unlimited."); // Backups - g_RoundBackupPathCvar = CreateConVar("get5_backup_path", "", "The folder to save backup files in, relative to the csgo directory. If defined, it must not start with a slash and must end with a slash. Set to empty string to use the csgo root."); + g_RoundBackupPathCvar = CreateConVar("get5_backup_path", "backups/", "The folder to save backup files in, relative to the csgo directory. If defined, it must not start with a slash and must end with a slash. Set to empty string to use the csgo root."); g_BackupSystemEnabledCvar = CreateConVar("get5_backup_system_enabled", "1", "Whether the Get5 backup system is enabled."); g_MaxBackupAgeCvar = CreateConVar("get5_max_backup_age", "172800", "Number of seconds before a backup file is automatically deleted. Set to 0 to disable. Default is 2 days."); g_StopCommandEnabledCvar = CreateConVar("get5_stop_command_enabled", "1", "Whether clients can use the !stop command to restore to the beginning of the current round."); @@ -432,8 +432,8 @@ public void OnPluginStart() { // Demos g_DemoUploadDeleteAfterCvar = CreateConVar("get5_demo_delete_after_upload", "0", "Whether to delete the demo from the game server after a successful upload."); - g_DemoNameFormatCvar = CreateConVar("get5_demo_name_format", "{TIME}_{MATCHID}_map{MAPNUMBER}_{MAPNAME}", "The format to use for demo files. Do not remove the {TIME} placeholder if you use the backup system. Set to empty string to disable automatic demo recording."); - g_DemoPathCvar = CreateConVar("get5_demo_path", "", "The folder to save demo files in, relative to the csgo directory. If defined, it must not start with a slash and must end with a slash. Set to empty string to use the csgo root."); + g_DemoNameFormatCvar = CreateConVar("get5_demo_name_format", "{MATCHID}_{TEAM1}_vs_{TEAM2}_map{MAPNUMBER}_{MAPNAME}_{TIME}", "The format to use for demo files. Do not remove the {TIME} placeholder if you use the backup system. Set to empty string to disable automatic demo recording."); + g_DemoPathCvar = CreateConVar("get5_demo_path", "demos/", "The folder to save demo files in, relative to the csgo directory. If defined, it must not start with a slash and must end with a slash. Set to empty string to use the csgo root."); g_DemoUploadHeaderKeyCvar = CreateConVar("get5_demo_upload_header_key", "Authorization", "If defined, a custom HTTP header with this name is added to the demo upload HTTP request.", FCVAR_PROTECTED); g_DemoUploadHeaderValueCvar = CreateConVar("get5_demo_upload_header_value", "", "If defined, the value of the custom header added to the demo upload HTTP request.", FCVAR_PROTECTED); g_DemoUploadURLCvar = CreateConVar("get5_demo_upload_url", "", "If defined, recorded demos will be uploaded to this URL over HTTP. If no protocol is provided, 'http://' is prepended to this value.", FCVAR_PROTECTED); @@ -442,7 +442,7 @@ public void OnPluginStart() { // Surrender/Forfeit g_ForfeitCountdownTimeCvar = CreateConVar("get5_forfeit_countdown", "180", "The grace-period (in seconds) for rejoining the server to avoid a loss by forfeit.", 0, true, 30.0); - g_ForfeitEnabledCvar = CreateConVar("get5_forfeit_enabled", "1", "Whether the forfeit feature is enabled."); + g_ForfeitEnabledCvar = CreateConVar("get5_forfeit_enabled", "0", "Whether the forfeit feature is enabled."); g_SurrenderCooldownCvar = CreateConVar("get5_surrender_cooldown", "60", "The number of seconds before a vote to surrender can be retried if it fails."); g_SurrenderEnabledCvar = CreateConVar("get5_surrender_enabled", "0", "Whether the surrender command is enabled."); g_MinimumRoundDeficitForSurrenderCvar = CreateConVar("get5_surrender_minimum_round_deficit", "8", "The minimum number of rounds a team must be behind in order to surrender.", 0, true, 0.0); @@ -456,7 +456,7 @@ public void OnPluginStart() { g_EventLogRemoteURLCvar = CreateConVar("get5_remote_log_url", "", "If defined, all events are sent to this URL over HTTP. If no protocol is provided, 'http://' is prepended to this value.", FCVAR_PROTECTED); // Damage info - g_DamagePrintCvar = CreateConVar("get5_print_damage", "1", "Whether damage reports are printed to chat on round end."); + g_DamagePrintCvar = CreateConVar("get5_print_damage", "0", "Whether damage reports are printed to chat on round end."); g_DamagePrintExcessCvar = CreateConVar("get5_print_damage_excess", "0", "Prints full damage given in the damage report on round end. With this disabled, a player cannot take more than 100 damage."); g_DamagePrintFormatCvar = CreateConVar("get5_damageprint_format", "- [{KILL_TO}] ({DMG_TO} in {HITS_TO}) to [{KILL_FROM}] ({DMG_FROM} in {HITS_FROM}) from {NAME} ({HEALTH} HP)", "Format of the damage output string. Available tags are in the default, color tags such as {LIGHT_RED} and {GREEN} also work. {KILL_TO} and {KILL_FROM} indicate kills, assists and flash assists as booleans, all of which are mutually exclusive."); @@ -493,9 +493,9 @@ public void OnPluginStart() { // Server config g_AutoLoadConfigCvar = CreateConVar("get5_autoload_config", "", "The path/name of a match config file to automatically load when the server loads or when the first player joins."); g_CheckAuthsCvar = CreateConVar("get5_check_auths", "1", "Whether players are forced onto the correct teams based on their Steam IDs."); - g_SetHostnameCvar = CreateConVar("get5_hostname_format", "Get5: {TEAM1} vs {TEAM2}", "The server hostname to use when a match is loaded. Set to \"\" to disable/use existing."); + g_SetHostnameCvar = CreateConVar("get5_hostname_format", "LXG: {TEAM1} vs {TEAM2}", "The server hostname to use when a match is loaded. Set to \"\" to disable/use existing."); g_KickClientImmunityCvar = CreateConVar("get5_kick_immunity", "1", "Whether admins with the 'changemap' flag will be immune to kicks from \"get5_kick_when_no_match_loaded\"."); - g_KickClientsWithNoMatchCvar = CreateConVar("get5_kick_when_no_match_loaded", "0", "Whether the plugin kicks players when no match is loaded and when a match ends."); + g_KickClientsWithNoMatchCvar = CreateConVar("get5_kick_when_no_match_loaded", "1", "Whether the plugin kicks players when no match is loaded and when a match ends."); g_KickOnForceEndCvar = CreateConVar("get5_kick_on_force_end", "0", "Whether players are kicked from the server when a match is forcefully ended. Requires get5_kick_when_no_match_loaded to be enabled also."); g_KnifeCfgCvar = CreateConVar("get5_knife_cfg", "get5/knife.cfg", "Config file to execute for the knife round."); g_LiveCfgCvar = CreateConVar("get5_live_cfg", "get5/live.cfg", "Config file to execute when the game goes live."); @@ -504,7 +504,7 @@ public void OnPluginStart() { g_MapsFileCvar = CreateConVar("get5_maps_file", "get5/maps.json", "The JSON file that contains maps selectable in the Get5 setup menu."); g_CvarsFileCvar = CreateConVar("get5_cvars_file", "get5/cvars.json", "The JSON file that contains sets of ConVars selectable when using the get5_creatematch CLI."); g_PrettyPrintJsonCvar = CreateConVar("get5_pretty_print_json", "1", "Whether all JSON output is in pretty-print format."); - g_PrintUpdateNoticeCvar = CreateConVar("get5_print_update_notice", "1", "Whether to print to chat when the game goes live if a new version of Get5 is available."); + g_PrintUpdateNoticeCvar = CreateConVar("get5_print_update_notice", "0", "Whether to print to chat when the game goes live if a new version of Get5 is available."); g_ServerIdCvar = CreateConVar("get5_server_id", "0", "A string that identifies your server. This is used in temporary files to prevent collisions and added as an HTTP header for network requests made by Get5."); g_StatsPathFormatCvar = CreateConVar("get5_stats_path_format", "get5_matchstats_{MATCHID}.cfg", "Where match stats are saved (updated each map end). Set to \"\" to disable."); g_WarmupCfgCvar = CreateConVar("get5_warmup_cfg", "get5/warmup.cfg", "Config file to execute during warmup periods."); diff --git a/scripting/get5/util.sp b/scripting/get5/util.sp index 8238d03a..53749f8f 100644 --- a/scripting/get5/util.sp +++ b/scripting/get5/util.sp @@ -17,7 +17,7 @@ #define MATCH_ID_LENGTH 64 #define TEAM1_STARTING_SIDE CS_TEAM_CT #define TEAM2_STARTING_SIDE CS_TEAM_T -#define DEFAULT_TAG "[{YELLOW}Get5{NORMAL}]" +#define DEFAULT_TAG "[{YELLOW}LXG{NORMAL}]" // Dummy value for when we need to write a KeyValue string, but we don't care about the value *or* // when the value is an empty string. Trying to write an empty string results in the KeyValue not // being written, so we use this.