some temporary changes

will change the fight mode after this commit