Added Battle flags, removed Flags (Bot should just use Bools)