Improve the fight algo, fix fight client