Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pushing kicking team filtering #1782

Open
wants to merge 9 commits into
base: main
Choose a base branch
from

Conversation

ThagonDuarte
Copy link
Contributor

@ThagonDuarte ThagonDuarte commented Mar 15, 2025

Why? What?

Locally infer kicking_team during SubState::PushingFreeKick.
Also adds a bevyhaviour simulator scenario kicking_team_filtering.rs to test the inference for all sub states where local inference is possible, i.e. GoalKick, CornerKick, PenaltyKick and PushingFreeKick.

Depends on #1789

ToDo / Known Issues

If this is a WIP describe which problems are to be fixed.

Ideas for Next Iterations (Not This PR)

  • One interesting thing to mention, is that during the scenario playback, starting from tick ~6700, player number six stands directly next to the ball during an opponents goal kick. This is an illegal position and should be investigated. Issue tracking this is Illegal position during opponent goal kick #1820.

How to Test

  • Trigger a PushingFreeKick in game and see if the behavior is correct when both we and the opponents are kicking team.

@github-project-automation github-project-automation bot moved this to Request for Review in Development Mar 15, 2025
@ThagonDuarte ThagonDuarte force-pushed the pushing-kicking-team-filtering branch 2 times, most recently from 6b75ee8 to 72715ca Compare March 16, 2025 08:50
@pejotejo pejotejo moved this from Request for Review to In Progress in Development Mar 26, 2025
@ThagonDuarte ThagonDuarte force-pushed the pushing-kicking-team-filtering branch 2 times, most recently from 8a267d9 to ac99255 Compare March 29, 2025 11:20
@ThagonDuarte ThagonDuarte moved this from In Progress to Request for Review in Development Mar 29, 2025
@ThagonDuarte ThagonDuarte enabled auto-merge April 1, 2025 10:28
@ThagonDuarte ThagonDuarte force-pushed the pushing-kicking-team-filtering branch from ac99255 to 61f5a9e Compare April 2, 2025 13:23
@oleflb oleflb self-assigned this Apr 2, 2025
@oleflb oleflb requested a review from Copilot April 2, 2025 13:43
Copy link

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR implements local inference of the kicking team during a PushingFreeKick by introducing a new ball state type and updating related filtering logic across modules. Key changes include:

  • Introducing a new LastBallState struct in the world state and updating ball state handling.
  • Adding new parameters to control ball observation durations.
  • Removing the deprecated kicking_team_filter module and updating game controller command patterns and filtering for various sub states.

Reviewed Changes

Copilot reviewed 22 out of 23 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
crates/types/src/world_state.rs Added LastBallState struct to timestamp ball state changes.
crates/types/src/parameters.rs Added new duration parameters for ball observation and new penalties.
crates/hulk_manifest/src/lib.rs Removed reference to kicking_team_filter.
crates/control/src/lib.rs Removed the kicking_team_filter module import.
crates/control/src/kicking_team_filter.rs Removed the deprecated kicking_team_filter module.
crates/control/src/game_controller_state_filter.rs Updated kicking team inference logic and integrated LastBallState usage.
crates/control/src/ball_state_composer.rs Updated ball state composition to use LastBallState and additional output.
crates/bevyhavior_simulator/src/game_controller.rs Modified command patterns to include Team and updated penalty handling.
crates/bevyhavior_simulator/src/autoref.rs Updated pattern matching to accommodate the new command signatures.
crates/bevyhavior_simulator/build.rs Removed kicking_team_filter dependency.
Files not reviewed (1)
  • etc/parameters/default.json: Language not supported

@ThagonDuarte ThagonDuarte force-pushed the pushing-kicking-team-filtering branch from 61f5a9e to f15635b Compare April 2, 2025 14:03
@ThagonDuarte ThagonDuarte force-pushed the pushing-kicking-team-filtering branch from f15635b to e0dc25b Compare April 2, 2025 14:31
@oleflb oleflb removed the GO25 label Apr 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Request for Review
Development

Successfully merging this pull request may close these issues.

2 participants