diff --git a/Constants_selector.py b/Constants_selector.py index d0e241e..d68ff42 100644 --- a/Constants_selector.py +++ b/Constants_selector.py @@ -12,41 +12,16 @@ SELECTION_CHANNEL = "on_model_selection" SUB_MODEL_NAMES = [ - "kickoff_1", - "kickoff_2", + "kickoff", "GP", "aerial", "flick_bump", - "flick", - "flip_reset_1", - "flip_reset_2", - "flip_reset_3", - "pinch", - "recover_↑", - "recover_↗", - "recover_→", - "recover_↘", - "recover_↓", - "recover_↙", - "recover_←", - "recover_↖", - "recover_b_left", - "recover_b_right", + "flip_reset", "recover_b_post", "recover_ball", - "halfflip_back", - "speedflip", - "halfflip_ball", - "walldash_str", - # "walldash_up", - # "walldash_down", - "walldash_boost", - "demo", + "walldash", "doubletap", "wall_play", - # "left_turn", - # "straight", - # "right_turn" ] diff --git a/CoyoteParser.py b/CoyoteParser.py index f7f6721..f8c662d 100644 --- a/CoyoteParser.py +++ b/CoyoteParser.py @@ -641,7 +641,7 @@ def __init__(self, obs_info=None): (SubAgent("aerial_jit.pt"), # 2 CoyoteObsBuilder_Legacy(expanding=True, tick_skip=4, team_size=3, extra_boost_info=False, mask_aerial_opp=True)), - (SubAgent("flick_2_jit.pt"), # flick bump + (SubAgent("flick_1_jit.pt"), # flick bump CoyoteObsBuilder_Legacy(expanding=True, tick_skip=4, team_size=3, embed_players=True)), (SubAgent("flipreset_3_jit.pt"), CoyoteObsBuilder_Legacy(expanding=True, tick_skip=4, team_size=3, extra_boost_info=False,