Skip to content

Commit 5a03700

Browse files
committed
Handle ball placement pos according to new rules
1 parent f8e23dd commit 5a03700

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

internal/app/statemachine/placementPos.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ type BallPlacementPosDeterminer struct {
1414
OnPositiveHalf map[state.Team]bool
1515
}
1616

17-
// BallPlacementPos determines the ball placement position based on the primary game event
17+
// Location determines the ball placement position based on the game event type
1818
func (s *BallPlacementPosDeterminer) Location() *geom.Vector2 {
1919
switch *s.Event.Type {
2020
case state.GameEvent_BALL_LEFT_FIELD_TOUCH_LINE:
@@ -47,25 +47,25 @@ func (s *BallPlacementPosDeterminer) Location() *geom.Vector2 {
4747
center := geom.NewVector2(0.0, 0.0)
4848
return s.validateLocation(center)
4949
case state.GameEvent_BOT_TIPPED_OVER:
50-
return s.validateLocation(s.Event.GetBotTippedOver().Location)
50+
return s.validateLocation(s.Event.GetBotTippedOver().BallLocation)
5151
case state.GameEvent_BOT_INTERFERED_PLACEMENT:
5252
return s.validateLocation(s.CurrentPlacementPos)
5353
case state.GameEvent_BOT_KICKED_BALL_TOO_FAST:
5454
return s.validateLocation(s.Event.GetBotKickedBallTooFast().Location)
5555
case state.GameEvent_BOT_DRIBBLED_BALL_TOO_FAR:
5656
return s.validateLocation(s.Event.GetBotDribbledBallTooFar().Start)
57-
case state.GameEvent_BOT_CRASH_UNIQUE:
58-
return s.validateLocation(s.Event.GetBotCrashUnique().Location)
5957
case state.GameEvent_BOT_PUSHED_BOT:
6058
return s.validateLocation(s.Event.GetBotPushedBot().Location)
6159
case state.GameEvent_BOT_HELD_BALL_DELIBERATELY:
6260
return s.validateLocation(s.Event.GetBotHeldBallDeliberately().Location)
6361
case state.GameEvent_ATTACKER_DOUBLE_TOUCHED_BALL:
6462
return s.validateLocation(s.Event.GetAttackerDoubleTouchedBall().Location)
6563
case state.GameEvent_ATTACKER_TOO_CLOSE_TO_DEFENSE_AREA:
66-
return s.validateLocation(s.Event.GetAttackerTooCloseToDefenseArea().Location)
64+
return s.validateLocation(s.Event.GetAttackerTooCloseToDefenseArea().BallLocation)
6765
case state.GameEvent_ATTACKER_TOUCHED_BALL_IN_DEFENSE_AREA:
6866
return s.validateLocation(s.Event.GetAttackerTouchedBallInDefenseArea().Location)
67+
case state.GameEvent_BOUNDARY_CROSSING:
68+
return s.validateLocation(s.Event.GetBoundaryCrossing().Location)
6969
case state.GameEvent_DEFENDER_TOO_CLOSE_TO_KICK_POINT:
7070
return s.validateLocation(s.CurrentPlacementPos)
7171
case state.GameEvent_DEFENDER_IN_DEFENSE_AREA, state.GameEvent_MULTIPLE_CARDS:

0 commit comments

Comments
 (0)