Skip to content

Combine chip_tactic and kick_tactic#3624

Open
StarrryNight wants to merge 20 commits intomasterfrom
samuel/combine_chip_and_kick
Open

Combine chip_tactic and kick_tactic#3624
StarrryNight wants to merge 20 commits intomasterfrom
samuel/combine_chip_and_kick

Conversation

@StarrryNight
Copy link
Copy Markdown
Contributor

@StarrryNight StarrryNight commented Feb 26, 2026

Description

This PR resolves #3236 . It combines kick fsm and chip fsm into one fsm, kick or chip fsm. Before the refactor, these two fsms shares practically the same structure. Both of them are also only used in scenarios when the ball is static, such as during free kick play or penalty kick play. This refactor uses an enum to pass in chip/kick and its corresponding parameters, streamlining the codebase.

Testing Done

Tests from kick fsm and chip fsm are moved into one single test file for kick and chip fsm. All tests passed.

Resolved Issues

#3236

Length Justification and Key Files to Review

Review Checklist

It is the reviewers responsibility to also make sure every item here has been covered

  • Function & Class comments: All function definitions (usually in the .h file) should have a javadoc style comment at the start of them. For examples, see the functions defined in thunderbots/software/geom. Similarly, all classes should have an associated Javadoc comment explaining the purpose of the class.
  • Remove all commented out code
  • Remove extra print statements: for example, those just used for testing
  • Resolve all TODO's: All TODO (or similar) statements should either be completed or associated with a github issue

@StarrryNight StarrryNight changed the title finish initial migration Combine chip and kick Feb 26, 2026
@StarrryNight StarrryNight changed the title Combine chip and kick Combine chip_tactic and kick_tactic Feb 26, 2026
@StarrryNight StarrryNight marked this pull request as ready for review March 1, 2026 05:09
@StarrryNight StarrryNight marked this pull request as draft March 1, 2026 06:14
@StarrryNight StarrryNight marked this pull request as ready for review March 12, 2026 03:41
@Andrewyx
Copy link
Copy Markdown
Contributor

@StarrryNight Closing this PR for now, create an issue to track this if you think it should be picked up later

@Andrewyx Andrewyx closed this Mar 29, 2026
@StarrryNight StarrryNight reopened this Apr 7, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Gameplay] Combine Kick and Chip FSMs

3 participants