Combine new hitbox system and animation