[#4] Add modifier keys to keyboard shortcuts to avoid interference

Author: g3force

src/components/control/ControlGeneral.vue

@@ -45,15 +45,15 @@
                 Continue
             </b-button>
         </span>
-        <div class="btn-group-toggle btn-group">
+        <div class="btn-group-toggle btn-group" v-hotkey="keymapToggleAutoRef">
             <label v-b-tooltip.hover
-                   title="Enable automatic continuation based on game events"
+                   :title="'Enable automatic continuation based on game events (' + Object.keys(keymapToggleAutoRef)[0] + ')'"
                    :class="{btn:true, 'btn-secondary': true, active: autoContinue}"
                    @click="setAutoContinue(true)">
                 Auto
             </label>
             <label v-b-tooltip.hover
-                   title="Disable automatic continuation based on game events"
+                   :title="'Disable automatic continuation based on game events (' + Object.keys(keymapToggleAutoRef)[0] + ')'"
                    :class="{btn:true, 'btn-secondary': true, active: !autoContinue}"
                    @click="setAutoContinue(false)">
                 Manual
@@ -92,7 +92,7 @@
             },
             keymapStop() {
                 return {
-                    'numpad 0': () => {
+                    'ctrl+alt+numpad 0': () => {
                         if (!this.$refs.btnStop.disabled) {
                             this.send('stop')
                         }
@@ -101,7 +101,7 @@
             },
             keymapForceStart() {
                 return {
-                    'numpad 5': () => {
+                    'ctrl+alt+numpad 5': () => {
                         if (!this.$refs.btnForceStart.disabled) {
                             this.send('forceStart')
                         }
@@ -110,7 +110,7 @@
             },
             keymapNormalStart() {
                 return {
-                    'numpad -': () => {
+                    'ctrl+alt+numpad 8': () => {
                         if (!this.$refs.btnNormalStart.disabled) {
                             this.send('normalStart')
                         }
@@ -119,13 +119,20 @@
             },
             keymapContinue() {
                 return {
-                    'numpad +': () => {
+                    'ctrl+alt+space': () => {
                         if (!this.$refs.btnContinue.disabled) {
                             this.triggerContinue()
                         }
                     }
                 }
             },
+            keymapToggleAutoRef() {
+                return {
+                    'ctrl+alt+numpad 2': () => {
+                        this.setAutoContinue(!this.autoContinue)
+                    }
+                }
+            },
             state() {
                 return this.$store.state.refBoxState
             },

src/components/control/ControlTeam.vue

@@ -90,23 +90,23 @@
             },
             keymapKickoff() {
                 if (this.teamColor === 'Yellow') {
-                    return {'numpad 1': this.sendKickoff};
+                    return {'ctrl+alt+numpad 1': this.sendKickoff};
                 } else if (this.teamColor === 'Blue') {
-                    return {'numpad 3': this.sendKickoff};
+                    return {'ctrl+alt+numpad 3': this.sendKickoff};
                 }
             },
             keymapDirect() {
                 if (this.teamColor === 'Yellow') {
-                    return {'numpad 7': this.sendDirect};
+                    return {'ctrl+alt+numpad 7': this.sendDirect};
                 } else if (this.teamColor === 'Blue') {
-                    return {'numpad 9': this.sendDirect};
+                    return {'ctrl+alt+numpad 9': this.sendDirect};
                 }
             },
             keymapIndirect() {
                 if (this.teamColor === 'Yellow') {
-                    return {'numpad 4': this.sendIndirect};
+                    return {'ctrl+alt+numpad 4': this.sendIndirect};
                 } else if (this.teamColor === 'Blue') {
-                    return {'numpad 6': this.sendIndirect};
+                    return {'ctrl+alt+numpad 6': this.sendIndirect};
                 }
             },
             state() {