[feature] Add reset game event

Author: g3force

internal/app/controller/engine.go

@@ -50,6 +50,10 @@ func (e *Engine) SendCommand(command RefCommand, forTeam Team) {
 	e.State.Command = command
 	e.State.CommandFor = forTeam
 	e.LogCommand()
+
+	if command.RunningState() && e.State.GameEvent != GameEventNone {
+		e.SendGameEvent(GameEventNone, "")
+	}
 }
 
 func (e *Engine) SendGameEvent(gameEvent GameEventType, forTeam Team) {

internal/app/controller/gameEvents.go

@@ -5,7 +5,7 @@ import "time"
 type GameEventType string
 
 const (
-	GameEventUnknown                GameEventType = "unknown"
+	GameEventNone                   GameEventType = "none"
 	GameEventBallLeftFieldTouchLine GameEventType = "ballLeftFieldTouchLine"
 	GameEventBallLeftFieldGoalLine  GameEventType = "ballLeftFieldGoalLine"
 )

internal/app/controller/state.go

@@ -156,6 +156,15 @@ const (
 	CommandBallPlacement RefCommand = "ballPlacement"
 )
 
+func (c RefCommand) RunningState() bool {
+	switch c {
+	case CommandNormalStart, CommandForceStart, CommandDirect, CommandIndirect:
+		return true
+	default:
+		return false
+	}
+}
+
 // GameState of a game
 type GameState string
 
@@ -211,7 +220,7 @@ func NewState() (s *State) {
 	s = new(State)
 	s.Stage = StagePreGame
 	s.Command = CommandHalt
-	s.GameEvent = GameEventUnknown
+	s.GameEvent = GameEventNone
 
 	s.StageTimeLeft = 0
 	s.StageTimeElapsed = 0

src/components/GameState.vue

@@ -1,5 +1,10 @@
 <template>
     <div>
+        <span v-b-tooltip.hover title="Last game event" v-if="state.gameEvent !== 'none'">
+            {{state.gameEvent}} <span v-if="state.gameEventForTeam !== ''">({{state.gameEventForTeam}})</span>
+            |
+        </span>
+
         <span v-b-tooltip.hover title="The current stage of the game">
             {{state.stage}}
         </span>
@@ -22,10 +27,6 @@
         <span v-b-tooltip.hover title="Current command">
             {{state.command}} <span v-if="state.commandForTeam !== ''">for {{state.commandForTeam}}</span>
         </span>
-        |
-        <span v-b-tooltip.hover title="Last game event">
-            {{state.gameEvent}} <span v-if="state.gameEventForTeam !== ''">for {{state.gameEventForTeam}}</span>
-        </span>
     </div>
 </template>
 

src/components/events/Events.vue

@@ -8,7 +8,7 @@
                           :per-page="perPage">
             </b-pagination>
 
-            <b-btn v-b-modal.new-event-modal size="sm" variant="primary">New</b-btn>
+            <b-btn v-b-modal.new-event-modal size="sm" variant="primary" :disabled="newEventDisabled">New</b-btn>
             <b-modal id="new-event-modal"
                      title="New Game Event"
                      :lazy="true">
@@ -37,6 +37,12 @@
         computed: {
             events() {
                 return this.$store.state.gameEvents;
+            },
+            state() {
+                return this.$store.state.refBoxState
+            },
+            newEventDisabled() {
+                return this.state.command !== 'stop' && this.state.command !== 'halt';
             }
         },
     }

src/store.js

@@ -22,7 +22,7 @@ export class RefBoxState {
     stage = 'unknown';
     command = 'unknown';
     commandForTeam = '';
-    gameEvent = 'unknown';
+    gameEvent = 'none';
     gameEventForTeam = '';
     stageTimeElapsed = 0;
     stageTimeLeft = 0;