No ball placement pos for non-stopping game events

Author: g3force

internal/app/statemachine/placementPos.go

@@ -52,8 +52,6 @@ func (s *BallPlacementPosDeterminer) Location() *geom.Vector2 {
 		return s.validateLocation(s.Event.GetBotTippedOver().BallLocation)
 	case state.GameEvent_BOT_INTERFERED_PLACEMENT:
 		return s.validateLocation(s.CurrentPlacementPos)
-	case state.GameEvent_BOT_KICKED_BALL_TOO_FAST:
-		return s.validateLocation(s.Event.GetBotKickedBallTooFast().Location)
 	case state.GameEvent_BOT_DRIBBLED_BALL_TOO_FAR:
 		return s.validateLocation(s.Event.GetBotDribbledBallTooFar().Start)
 	case state.GameEvent_BOT_PUSHED_BOT:
@@ -64,8 +62,6 @@ func (s *BallPlacementPosDeterminer) Location() *geom.Vector2 {
 		return s.validateLocation(s.Event.GetAttackerDoubleTouchedBall().Location)
 	case state.GameEvent_ATTACKER_TOO_CLOSE_TO_DEFENSE_AREA:
 		return s.validateLocation(s.Event.GetAttackerTooCloseToDefenseArea().BallLocation)
-	case state.GameEvent_ATTACKER_TOUCHED_BALL_IN_DEFENSE_AREA:
-		return s.validateLocation(s.Event.GetAttackerTouchedBallInDefenseArea().Location)
 	case state.GameEvent_BOUNDARY_CROSSING:
 		return s.validateLocation(s.Event.GetBoundaryCrossing().Location)
 	case state.GameEvent_DEFENDER_TOO_CLOSE_TO_KICK_POINT:

internal/app/statemachine/placementPos_test.go

@@ -105,48 +105,48 @@ func Test_BallPlacementPos(t *testing.T) {
 			want:  geom.NewVector2(fl/2-og, -(fw/2 - ot)),
 		},
 		{
-			name:  "bot kicked ball too fast 1",
-			event: createBotKickedBallToFastEvent(geom.NewVector2(0, 0)),
+			name:  "bot dribbled too far 1",
+			event: createBotDribbledTooFarEvent(geom.NewVector2(0, 0)),
 			want:  geom.NewVector2(0, 0),
 		},
 		{
-			name:  "bot kicked ball too fast 2",
-			event: createBotKickedBallToFastEvent(geom.NewVector2(1, -2)),
+			name:  "bot dribbled too far 2",
+			event: createBotDribbledTooFarEvent(geom.NewVector2(1, -2)),
 			want:  geom.NewVector2(1, -2),
 		},
 		{
-			name:  "bot kicked ball too fast 3",
-			event: createBotKickedBallToFastEvent(geom.NewVector2(1, -42)),
+			name:  "bot dribbled too far 3",
+			event: createBotDribbledTooFarEvent(geom.NewVector2(1, -42)),
 			want:  geom.NewVector2(1, -(fw/2 - ot)),
 		},
 		{
-			name:  "bot kicked ball too fast 4",
-			event: createBotKickedBallToFastEvent(geom.NewVector2(1, 42)),
+			name:  "bot dribbled too far 4",
+			event: createBotDribbledTooFarEvent(geom.NewVector2(1, 42)),
 			want:  geom.NewVector2(1, fw/2-ot),
 		},
 		{
-			name:  "bot kicked ball too fast 5",
-			event: createBotKickedBallToFastEvent(geom.NewVector2(fl/2, -42)),
+			name:  "bot dribbled too far 5",
+			event: createBotDribbledTooFarEvent(geom.NewVector2(fl/2, -42)),
 			want:  geom.NewVector2(fl/2-og, -(fw/2 - ot)),
 		},
 		{
-			name:  "bot kicked ball too fast 6",
-			event: createBotKickedBallToFastEvent(geom.NewVector2(-fl/2, -42)),
+			name:  "bot dribbled too far 6",
+			event: createBotDribbledTooFarEvent(geom.NewVector2(-fl/2, -42)),
 			want:  geom.NewVector2(-(fl/2 - og), -(fw/2 - ot)),
 		},
 		{
-			name:  "bot kicked ball too fast 7",
-			event: createBotKickedBallToFastEvent(geom.NewVector2(42, 0)),
+			name:  "bot dribbled too far 7",
+			event: createBotDribbledTooFarEvent(geom.NewVector2(42, 0)),
 			want:  geom.NewVector2(fl/2-dd-od, 0),
 		},
 		{
-			name:  "bot kicked ball too fast 8",
-			event: createBotKickedBallToFastEvent(geom.NewVector2(fl/2-0.1, dw/2-0.1)),
+			name:  "bot dribbled too far 8",
+			event: createBotDribbledTooFarEvent(geom.NewVector2(fl/2-0.1, dw/2-0.1)),
 			want:  geom.NewVector2(fl/2-og, dw/2+od),
 		},
 		{
-			name:  "bot kicked ball too fast 9",
-			event: createBotKickedBallToFastEvent(geom.NewVector2(fl/2-dd, dw/2-0.1)),
+			name:  "bot dribbled too far 9",
+			event: createBotDribbledTooFarEvent(geom.NewVector2(fl/2-dd, dw/2-0.1)),
 			want:  geom.NewVector2(fl/2-dd-od, dw/2-0.1),
 		},
 	}
@@ -190,15 +190,15 @@ func createBallLeftFieldGoalLine(eventLocation *geom.Vector2, placingTeam state.
 		},
 	}
 }
-func createBotKickedBallToFastEvent(eventLocation *geom.Vector2) *state.GameEvent {
+func createBotDribbledTooFarEvent(eventLocation *geom.Vector2) *state.GameEvent {
 	var byTeam = state.Team_YELLOW
-	eventType := state.GameEvent_BOT_KICKED_BALL_TOO_FAST
+	eventType := state.GameEvent_BOT_DRIBBLED_BALL_TOO_FAR
 	return &state.GameEvent{
 		Type: &eventType,
-		Event: &state.GameEvent_BotKickedBallTooFast_{
-			BotKickedBallTooFast: &state.GameEvent_BotKickedBallTooFast{
-				ByTeam:   &byTeam,
-				Location: eventLocation,
+		Event: &state.GameEvent_BotDribbledBallTooFar_{
+			BotDribbledBallTooFar: &state.GameEvent_BotDribbledBallTooFar{
+				ByTeam: &byTeam,
+				Start:  eventLocation,
 			},
 		},
 	}