[refactoring] Put normalStart into nextCommand, use nextCommand for UI

Author: g3force

internal/app/controller/engine.go

@@ -104,12 +104,15 @@ func (e *Engine) Continue() {
 		e.SendCommand(CommandHalt, "")
 	} else if e.State.NextCommand != CommandUnknown {
 		e.SendCommand(e.State.NextCommand, e.State.NextCommandFor)
-	} else if e.State.Command == CommandPenalty || e.State.Command == CommandKickoff {
-		e.SendCommand(CommandNormalStart, "")
 	}
 }
 
 func (e *Engine) updateNextCommand() {
+	if e.State.Command == CommandPenalty || e.State.Command == CommandKickoff {
+		e.State.NextCommand = CommandNormalStart
+		e.State.NextCommandFor = ""
+		return
+	}
 	primaryEvent := e.State.PrimaryGameEvent()
 	if primaryEvent == nil {
 		return

src/components/GameState.vue

@@ -1,5 +1,13 @@
 <template>
     <div>
+        <span v-b-tooltip.hover title="Next command">
+            <span v-if="state.nextCommand !== ''"
+                    :class="{'team-blue': state.nextCommandFor === 'Blue', 'team-yellow': state.nextCommandFor === 'Yellow'}">
+            {{state.nextCommand}}
+            </span>
+            <span v-if="state.nextCommand === ''">-</span>
+        </span>
+        |
         <span v-b-tooltip.hover title="Last game event">
             <span v-if="state.gameEvents.length > 0">{{state.gameEvents[0].type}}</span>
             <span v-if="state.gameEvents.length === 0">-</span>
@@ -8,13 +16,6 @@
               v-b-tooltip.hover title="Additional game events">
                 (+{{state.gameEvents.length-1}})
         </span>
-        <span v-if="state.nextCommand !== ''"
-              v-b-tooltip.hover title="Next command">
-            ->
-            <span :class="{'team-blue': state.nextCommandFor === 'Blue', 'team-yellow': state.nextCommandFor === 'Yellow'}">
-            {{state.nextCommand}}
-            </span>
-        </span>
         |
         <span v-b-tooltip.hover title="The current stage of the game">
             {{state.stage}}

src/components/control/ControlGeneral.vue

@@ -135,9 +135,6 @@
             stopped() {
                 return this.state.command === 'stop';
             },
-            ballPlacement() {
-                return this.state.command === 'ballPlacement';
-            },
             prepareSth() {
                 return this.state.command === 'kickoff' || this.state.command === 'penalty';
             },
@@ -151,14 +148,11 @@
                 return isNonPausedStage(this.$store.state.refBoxState)
                     || isPreStage(this.$store.state.refBoxState);
             },
-            gameEventPresent() {
-                return this.state.gameEvents.length > 0;
-            },
             autoContinue() {
                 return this.state.autoContinue;
             },
             continuePossible() {
-                return (this.gameEventPresent && (this.stopped || this.ballPlacement)) || this.prepareSth;
+                return this.state.nextCommand !== '';
             }
         }
     }