Fix the fight engine and put more into the common part