Initiative Macro for Dark Heresy 2e - how to get around the Constant Vigilance talent??!

Hey, I have seen the initiative macro for DH 2e, however, the Constant Vigilance talent permits a PC to use either Perception or Intelligence in place of Agility whem making an Initiative test, is there any way to make a macro that takes this talent into account yet is still usable by all PCs?

Two ways: - Ask the player to enter their initiative bonus manually, at the time of use. [[ 1d20 + ?{What's Your Initiative Bonus?|0} &{tracker} ]] - Store the Initiative Bonus (regardless of where it came from) as an Attribute on their character journal. [[ 1d20 + @{Selected|InitBonus} &{tracker} ]] Note: If you store it as an attribute on their character sheet, you need to make sure the token is associated with the sheet properly

Magic, cheers mate!