Added players to match presets

kcapp · Dec 1, 2024 · 3e1e1ad · 3e1e1ad
1 parent a07ed5f
commit 3e1e1ad
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ A preview of major changes can be found in the Wiki ([Latest Changes](https://gi
 - Ability to configure: "Announcement Volume", "Auto Busting" and "Auto Leg Finish" from frontend
 - Holding score buttons to score same dart three times
 - Support `Max Rounds` to play for `x01`
+- Added option to configure `players` on match presets
 - Lots of new Badges
 
 #### Changed

diff --git a/src/components/scorecard-header/scorecard-header.component.js b/src/components/scorecard-header/scorecard-header.component.js
@@ -6,12 +6,15 @@ module.exports = {
 
         let name = input.players[player.player_id].name;
         if (player.player.is_bot) {
-            if (player.bot_config.player_id) {
+            if (!player.bot_config) {
+                name = `${name} (${skill.fromInt(skill.MEDIUM.skill).name})`;
+            } else if (player.bot_config.player_id) {
                 name = `${name} as ${input.players[player.bot_config.player_id].name}`;
             } else {
                 name = `${name} (${skill.fromInt(player.bot_config.skill_level).name})`;
             }
         }
+
         this.state = {
             player: player,
             name: name,

diff --git a/src/components/scorecard-header/scorecard-header.marko b/src/components/scorecard-header/scorecard-header.marko
@@ -17,7 +17,7 @@ $ const types = require("../scorecard/components/match_types");
     </else-if>
     <else-if(input.type == types.ONESEVENTY)>
       <div class="label-player-name">
-        $ let dartsRemaining = 9 - state.player.darts_thrown; 
+        $ let dartsRemaining = 9 - state.player.darts_thrown;
         <if(dartsRemaining === 0)>
           &nbsp;
         </if>

diff --git a/src/pages/index/components/new-game-form/new-game-form.component.js b/src/pages/index/components/new-game-form/new-game-form.component.js
@@ -85,6 +85,18 @@ module.exports = {
                             modeComponent.state.index = preset.match_mode.id;
                             this.state.options.game_mode = modeComponent.state.index;
 
+                            if (preset.players) {
+                                // loop through and add each player
+                                preset.players.forEach((playerId) => {
+                                    const player = _.find(this.input.players, (p) => {
+                                        return p.id === playerId;
+                                    });
+                                    if (player) {
+                                        this.addPlayer(null, player);
+                                    }
+                                });
+                            }
+
                             alertify.success(`Configured preset "${preset.name}"`);
                             if (this.state.selected.length > 1) {
                                 this.newGame();

diff --git a/src/util/socket.io-helper.js b/src/util/socket.io-helper.js
@@ -46,7 +46,7 @@ exports.onScoreUpdate = (data, thiz) => {
             component.reset();
             component.state.jdcDart = null;
 
-            isSecondLastRound =  player.player_id === players[0].player_id && leg.parameters.max_rounds && leg.parameters.max_rounds === leg.round;
+            isSecondLastRound = leg.parameters && player.player_id === players[0].player_id && leg.parameters.max_rounds && leg.parameters.max_rounds === leg.round;
         } else {
             if (currentPlayerIdx <= i) {
                 component.state.jdcDart = null;