diff --git a/src/components/NewMatchForm.vue b/src/components/NewMatchForm.vue index b31ca2c..fa81ed3 100644 --- a/src/components/NewMatchForm.vue +++ b/src/components/NewMatchForm.vue @@ -89,6 +89,16 @@ ref="teamTwo" /> + + + + + + {{ $t("CreateMatch.FormSeriesType") }} @@ -374,7 +384,8 @@ export default { veto_first: "team1", spectators: [], side_type: "standard", - map_sides: [] + map_sides: [], + wingman: false }, selectedTeams: [], newDialog: false, @@ -445,11 +456,16 @@ export default { seasonCvars.map_sides.length < 1 ? [] : seasonCvars.map_sides.trim().split(" "); + this.newMatchData.wingman = + seasonCvars.wingman == null || seasonCvars.wingman == 0 + ? false + : true; //Delete all used get prepare custom CVARs. delete seasonCvars.min_players_to_ready; delete seasonCvars.min_spectators_to_ready; delete seasonCvars.players_per_team; delete seasonCvars.maps_to_win; + delete seasonCvars.wingman; delete seasonCvars.skip_veto; delete seasonCvars.map_pool; delete seasonCvars.side_type; @@ -549,6 +565,7 @@ export default { match_cvars: newCvar, veto_first: this.newMatchData.veto_first, skip_veto: this.newMatchData.skip_veto, + wingman: this.newMatchData.wingman, spectator_auths: this.newMatchData.spectators, min_players_to_ready: parseInt( this.newMatchData.min_players_to_ready diff --git a/src/components/SeasonsTable.vue b/src/components/SeasonsTable.vue index bf67783..54be64a 100644 --- a/src/components/SeasonsTable.vue +++ b/src/components/SeasonsTable.vue @@ -206,6 +206,15 @@ + + + + + {{ $t("CreateMatch.FormSeriesType") }} @@ -479,7 +488,8 @@ export default { map_pool: [], spectators: [], side_type: "standard", - map_sides: [] + map_sides: [], + wingman: false }, datemenu: false, formTitle: this.$t("Seasons.NewFormTitle"), @@ -527,7 +537,8 @@ export default { map_pool: [], spectators: [], side_type: "standard", - map_sides: [] + map_sides: [], + wingman: false }; this.$refs.newSeasonForm.resetValidation(); }); @@ -685,7 +696,8 @@ export default { map_pool: [], spectators: [], side_type: "standard", - map_sides: [] + map_sides: [], + wingman: false }; this.$refs.newSeasonForm.resetValidation(); }); @@ -711,6 +723,7 @@ export default { obj !== "players_per_team" && obj !== "maps_to_win" && obj !== "skip_veto" && + obj !== "wingman" && obj !== "map_pool" && obj !== "spectators" && obj !== "side_type" && @@ -724,7 +737,7 @@ export default { this.seasonDefaults[obj] = seasonCvars[obj].split(" "); else if (obj === "maps_to_win") this.seasonDefaults[obj] = parseInt(seasonCvars[obj]); - else if (obj === "skip_veto") { + else if (obj === "skip_veto" || obj === "wingman") { seasonCvars[obj] = seasonCvars[obj] == 0 ? false : true; this.seasonDefaults[obj] = seasonCvars[obj]; } else if (obj === "map_sides") { diff --git a/src/components/VetoTable.vue b/src/components/VetoTable.vue index bbaeaa6..c8d2a75 100644 --- a/src/components/VetoTable.vue +++ b/src/components/VetoTable.vue @@ -22,7 +22,11 @@ {{ $t("Veto.VetoPick") }} -
+
{{ $t("Veto.VetoBan") }}
diff --git a/src/translations/translations.json b/src/translations/translations.json index 7af2ba8..391ae11 100644 --- a/src/translations/translations.json +++ b/src/translations/translations.json @@ -112,7 +112,8 @@ "MapSides": "Map Side For Map {map}", "MapSidesTeam1CT": "Team 1 Starts CT", "MapSidesTeam2CT": "Team 2 Starts CT", - "MapSidesKnife": "Teams Knife For Sides" + "MapSidesKnife": "Teams Knife For Sides", + "Wingman": "Wingman Match?" }, "PlayerStats": { "Kills": "Kills", @@ -478,7 +479,8 @@ "MapSides": "Côté de la map pour la carte {map}", "MapSidesTeam1CT": "Equipe 1 démarre en CT", "MapSidesTeam2CT": "Equipe 2 démarre en CT", - "MapSidesKnife": "Coté décidé par un round au couteau" + "MapSidesKnife": "Coté décidé par un round au couteau", + "Wingman": "Match d'ailier ?" }, "PlayerStats": { "Kills": "Kills", @@ -840,7 +842,8 @@ "SkipVeto": "ゲーム内拒否権をスキップ?", "KnifeDefault": "デフォルト", "KnifeNever": "ネバーナイフ", - "KnifeAlways": "常にナイフ" + "KnifeAlways": "常にナイフ", + "Wingman": "ウィングマン・マッチ?" }, "PlayerStats": { "Kills": "キルズ",