-
Notifications
You must be signed in to change notification settings - Fork 177
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve match start menu + add get5_creatematch cli (#988)
Adjust tests and match config load feedback Reorder functions in matchconfig.sp Add tests for loading scrim configs Add backup browser support to the new menu Remove redundant scrim functions Allow force-ready for backup restore Add option to select winner on force-end Fix winner team name empty on early force-end Add 5 series delay before kick when ending series due to timeout Validate team "id" property in JSON Refactor get5_creatematch to work as CLI Use json_get_last_error for better error feedback Refactor JSON file loading Add Wingman maps to map formatter Use StrContains to format map names to support workshop maps Introduce "random" option to side_type Fix indents in template files Remove old Command_CreateMatch code Fix ArrayList memory leaks Sort printed map list alphabetically Fix random side type Support sorting maps with formatted names in map menu Fix workshop maps not being formatted Add Canals and Aztec to map formatter Update sm-json to v5 dev
- Loading branch information
Showing
25 changed files
with
3,410 additions
and
786 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| { | ||
| "default": { | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| { | ||
| "default": [ | ||
| "de_ancient", | ||
| "de_anubis", | ||
| "de_inferno", | ||
| "de_mirage", | ||
| "de_nuke", | ||
| "de_overpass", | ||
| "de_vertigo" | ||
| ], | ||
| "extended": [ | ||
| "de_ancient", | ||
| "de_anubis", | ||
| "de_dust2", | ||
| "de_inferno", | ||
| "de_mirage", | ||
| "de_nuke", | ||
| "de_overpass", | ||
| "de_train", | ||
| "de_vertigo" | ||
| ], | ||
| "wingman": [ | ||
| "de_boyard", | ||
| "de_chalice", | ||
| "de_cbble", | ||
| "de_inferno", | ||
| "de_overpass", | ||
| "de_shortdust", | ||
| "de_shortnuke", | ||
| "de_train", | ||
| "de_vertigo" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,86 +1,68 @@ | ||
| "Match" | ||
| { | ||
| "matchid" "example_match" | ||
| "num_maps" "3" // Must be an odd number or 2. 1->Bo1, 2->Bo2, 3->Bo3, etc. | ||
| "matchid" "example_match" | ||
| "num_maps" "3" | ||
| "spectators" // players allowed in spectator (e.g., admins) should go here | ||
| { | ||
| "players" | ||
| { | ||
| "76561197996426755" "" | ||
| } | ||
| } | ||
| "skip_veto" "0" // If set to 1, the maps will be preset using the first maps in the maplist below. | ||
| "veto_first" "team1" // Set to "random", "team1" or "team2" to select who starts the veto. Any other values will default to team1 starting. | ||
| "side_type" "standard" // Either "standard", "always_knife", or "never_knife" | ||
| "maplist" | ||
| { | ||
| "de_ancient" "" | ||
| "de_inferno" "" | ||
| "de_mirage" "" | ||
| "de_nuke" "" | ||
| "de_overpass" "" | ||
| "de_anubis" "" | ||
| "de_vertigo" "" | ||
| } | ||
| "players_per_team" "5" | ||
| "coaches_per_team" "2" | ||
| "min_players_to_ready" "1" // Minimum # of players a team must have to ready | ||
|
|
||
| "spectators" // players allowed in spectator (e.g., admins) should go here | ||
| { | ||
| "players" | ||
| { | ||
| "STEAM_1:1:....." "" | ||
| "STEAM_1:1:....." "" | ||
| "STEAM_1:1:....." "" | ||
| } | ||
| } | ||
| "team1" | ||
| { | ||
| "name" "EnvyUs" // You should always set a team name, otherwise some chat messages will not make sense. If there is no true team name, use "Team1" at least. | ||
| "tag" "EnvyUs" // Short tags replace the "clan tag" on the scoreboard. They are optional. | ||
| "flag" "FR" | ||
| "logo" "nv" | ||
| "players" | ||
| { | ||
| // Any of the 3 formats (steam2, steam3, steam64 profile) are acceptable. | ||
| // Note: the "players" section may be skipped if you set get5_check_auths to 0, | ||
| // but that is not recommended. You can also set player names that will be forced here. | ||
| // If you don't want to force player names, just use an empty quote "". | ||
| "STEAM_0:1:52245092" "splewis" | ||
| "[U:1:104490185]" "" | ||
| "76561198064755913" "" | ||
| } | ||
| } | ||
| "skip_veto" "0" // If set to 1, the maps will be preset using the first maps in the maplist below. | ||
|
|
||
| "veto_first" "team1" // Set to "random", "team1" or "team2" to select who starts the veto. Any other values will default to team1 starting. | ||
|
|
||
| "side_type" "standard" // Either "standard", "always_knife", or "never_knife" | ||
|
|
||
| "maplist" | ||
| { | ||
| "de_dust2" "" | ||
| "de_inferno" "" | ||
| "de_mirage" "" | ||
| "de_nuke" "" | ||
| "de_overpass" "" | ||
| "de_train" "" | ||
| "de_vertigo" "" | ||
| } | ||
|
|
||
| "players_per_team" "5" | ||
| "coaches_per_team" "2" | ||
| "min_players_to_ready" "1" // Minimum # of players a team must have to ready | ||
| "min_spectators_to_ready" "0" // How many spectators must be ready to begin. | ||
|
|
||
| // These values wrap mp_teamprediction_pct and mp_teamprediction_txt. | ||
| // You can exclude these if you don't want those cvars set. | ||
| "favored_percentage_team1" "65" | ||
| "favored_percentage_text" "HLTV Bets" | ||
| "team1" | ||
| { | ||
| "name" "EnvyUs" // You should always set a team name, otherwise some chat messages will not make sense. If there is no true team name, use "Team1" at least. | ||
| "tag" "EnvyUs" // Short tags replace the "clan tag" on the scoreboard. They are optional. | ||
| "flag" "FR" | ||
| "logo" "nv" | ||
| "players" | ||
| { | ||
| // Any of the 3 formats (steam2, steam3, steam64 profile) are acceptable. | ||
| // Note: the "players" section may be skipped if you set get5_check_auths to 0, | ||
| // but that is not recommended. You can also set player names that will be forced here. | ||
| // If you don't want to force player names, just use an empty quote "". | ||
| "STEAM_0:1:52245092" "splewis" | ||
| "[U:1:104490185]" "" | ||
| "76561198064755913" "" | ||
| "STEAM_1:1:....." "" | ||
| "STEAM_1:1:....." "" | ||
| } | ||
| } | ||
|
|
||
| "team2" | ||
| { | ||
| "name" "Fnatic" | ||
| "tag" "fnatic" | ||
| "flag" "SE" | ||
| "logo" "fntc" | ||
| "players" | ||
| { | ||
| "STEAM_1:1:46796472" "" | ||
| "STEAM_1:0:78189799" "" | ||
| "STEAM_1:0:142982" "" | ||
| "STEAM_1:1:....." "" | ||
| "STEAM_1:1:....." "" | ||
| } | ||
| } | ||
|
|
||
| // These will be executed on each map start or config load. | ||
| // You should not use this as a replacement for the cfg/get5/live.cfg config. | ||
| "cvars" | ||
| { | ||
| "hostname" "Match server #1" | ||
| "sm_practicemode_can_be_started" "0" // Disallow enabling practice mode when a match is loaded. | ||
| } | ||
| "team2" | ||
| { | ||
| "name" "Fnatic" | ||
| "tag" "fnatic" | ||
| "flag" "SE" | ||
| "logo" "fntc" | ||
| "players" | ||
| { | ||
| "STEAM_1:1:46796472" "" | ||
| "STEAM_1:0:78189799" "" | ||
| "STEAM_1:0:142982" "" | ||
| } | ||
| } | ||
| // These will be executed on each map start or config load. | ||
| // You should not use this as a replacement for the cfg/get5/live.cfg config, but you can use it to change | ||
| // individual parameters, such as friendly fire. These parameters are applied *after* the live config and will | ||
| // override it. | ||
| "cvars" | ||
| { | ||
| "sm_practicemode_can_be_started" "0" // Disallow enabling practice mode when a match is loaded. | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,69 +1,48 @@ | ||
| { | ||
| "matchid": "example_match", | ||
| "num_maps": 3, | ||
| "players_per_team": 5, | ||
| "coaches_per_team": 2, | ||
| "min_players_to_ready": 1, | ||
| "min_spectators_to_ready": 0, | ||
| "skip_veto": false, | ||
| "veto_first": "team1", | ||
| "side_type": "standard", | ||
|
|
||
| "spectators": { | ||
| "players": | ||
| [ | ||
| "STEAM_1:1:.....", | ||
| "STEAM_1:1:.....", | ||
| "STEAM_1:1:....." | ||
| ] | ||
| }, | ||
|
|
||
| "maplist": | ||
| [ | ||
| "de_dust2", | ||
| "de_inferno", | ||
| "de_mirage", | ||
| "de_nuke", | ||
| "de_overpass", | ||
| "de_train", | ||
| "de_vertigo" | ||
| ], | ||
|
|
||
| "favored_percentage_team1": 65, | ||
| "favored_percentage_text": "HLTV Bets", | ||
|
|
||
| "team1": { | ||
| "name": "EnvyUs", | ||
| "tag": "EnvyUs", | ||
| "flag": "FR", | ||
| "logo": "nv", | ||
| "players": | ||
| { | ||
| "STEAM_0:1:52245092" : "splewis", | ||
| "STEAM_1:1:....." : "", | ||
| "STEAM_1:1:....." : "", | ||
| "STEAM_1:1:....." : "", | ||
| "STEAM_1:1:....." : "" | ||
| } | ||
| }, | ||
|
|
||
| "team2": { | ||
| "name": "Fnatic", | ||
| "tag": "Fnatic", | ||
| "flag": "SE", | ||
| "logo": "fntc", | ||
| "players": | ||
| [ | ||
| "STEAM_1:1:46796472", | ||
| "STEAM_1:0:78189799", | ||
| "STEAM_1:0:142982", | ||
| "STEAM_1:1:.....", | ||
| "STEAM_1:1:....." | ||
| ] | ||
| }, | ||
|
|
||
| "cvars": { | ||
| "hostname": "Match server #1", | ||
| "sm_practicemode_can_be_started": "0" | ||
| } | ||
| "matchid": "example_match", | ||
| "num_maps": 3, | ||
| "players_per_team": 5, | ||
| "coaches_per_team": 2, | ||
| "min_players_to_ready": 1, | ||
| "skip_veto": false, | ||
| "veto_first": "team1", | ||
| "side_type": "standard", | ||
| "spectators": { | ||
| "players": [ | ||
| "76561197996426755" | ||
| ] | ||
| }, | ||
| "maplist": [ | ||
| "de_ancient", | ||
| "de_inferno", | ||
| "de_mirage", | ||
| "de_nuke", | ||
| "de_overpass", | ||
| "de_anubis", | ||
| "de_vertigo" | ||
| ], | ||
| "team1": { | ||
| "name": "EnvyUs", | ||
| "tag": "EnvyUs", | ||
| "flag": "FR", | ||
| "logo": "nv", | ||
| "players": { | ||
| "STEAM_0:1:52245092": "splewis", | ||
| "76561198064755913": "" | ||
| } | ||
| }, | ||
| "team2": { | ||
| "name": "Fnatic", | ||
| "tag": "Fnatic", | ||
| "flag": "SE", | ||
| "logo": "fntc", | ||
| "players": [ | ||
| "STEAM_1:1:46796472", | ||
| "STEAM_1:0:78189799", | ||
| "STEAM_1:0:142982" | ||
| ] | ||
| }, | ||
| "cvars": { | ||
| "sm_practicemode_can_be_started": "0" | ||
| } | ||
| } |
Oops, something went wrong.