[feature] Add continue button

Author: g3force

internal/app/controller/engine.go

@@ -72,6 +72,18 @@ func (e *Engine) UndoLastAction() {
 	}
 }
 
+func (e *Engine) Continue() error {
+	switch e.State.GameEvent {
+	case GameEventBallLeftFieldTouchLine:
+		e.SendCommand(CommandIndirect, e.State.GameEventFor.Opposite())
+	case GameEventBallLeftFieldGoalLine:
+		e.SendCommand(CommandDirect, e.State.GameEventFor.Opposite())
+	default:
+		return errors.New("No game event present")
+	}
+	return nil
+}
+
 func (e *Engine) Process(event Event) error {
 	err := e.processEvent(event)
 	if err != nil {
@@ -326,7 +338,7 @@ func addCard(card *EventCard, teamState *TeamInfo, duration time.Duration) error
 	return nil
 }
 
-func (e *Engine) processTrigger(t *EventTrigger) error {
+func (e *Engine) processTrigger(t *EventTrigger) (err error) {
 	if t.Type == TriggerResetMatch {
 		e.ResetGame()
 	} else if t.Type == TriggerSwitchColor {
@@ -339,11 +351,13 @@ func (e *Engine) processTrigger(t *EventTrigger) error {
 		e.State.TeamState[TeamBlue].OnPositiveHalf = yellowOnPositiveHalf
 	} else if t.Type == TriggerUndo {
 		e.UndoLastAction()
+	} else if t.Type == TriggerContinue {
+		err = e.Continue()
 	} else {
 		return errors.Errorf("Unknown trigger: %v", t.Type)
 	}
 	log.Printf("Processed trigger %v", t.Type)
-	return nil
+	return err
 }
 
 func (e *Engine) processGameEvent(t *EventGameEvent) error {

internal/app/controller/events.go

@@ -49,6 +49,8 @@ const (
 	TriggerSwitchSides TriggerType = "switchSides"
 	// TriggerUndo undo last action
 	TriggerUndo TriggerType = "undo"
+	// TriggerContinue continues based on the current game event
+	TriggerContinue TriggerType = "continue"
 )
 
 // CardModification to apply to a card

src/components/control/ControlGeneral.vue

@@ -32,6 +32,14 @@
                 Normal Start
             </b-button>
         </span>
+        <span v-b-tooltip.hover
+              :title="'Continue based on last game event (' + Object.keys(keymapContinue)[0] + ')'">
+            <b-button v-hotkey="keymapContinue"
+                      v-on:click="triggerContinue"
+                      v-bind:disabled="!gameEventPresent">
+                Continue
+            </b-button>
+        </span>
     </span>
 </template>
 
@@ -42,7 +50,10 @@
         name: "ControlGeneral",
         methods: {
             send: function (command) {
-                this.$socket.sendObj({'command': {'commandType': command}})
+                this.$socket.sendObj({command: {commandType: command}})
+            },
+            triggerContinue() {
+                this.$socket.sendObj({trigger: {triggerType: 'continue'}})
             }
         },
         computed: {
@@ -56,7 +67,10 @@
                 return {'numpad 5': () => this.send('forceStart')}
             },
             keymapNormalStart() {
-                return {'numpad +': () => this.send('normalStart')}
+                return {'numpad -': () => this.send('normalStart')}
+            },
+            keymapContinue() {
+                return {'numpad +': () => this.triggerContinue()}
             },
             state() {
                 return this.$store.state.refBoxState
@@ -73,6 +87,9 @@
             inNormalHalf() {
                 return isInNormalHalf(this.state);
             },
+            gameEventPresent() {
+                return this.state.gameEvent !== 'none';
+            }
         }
     }
 </script>