Hong Kong police and protesters refine battle tactics