Added force drink for target swap

Also moved combat related stuff into the combat tab