Critical hits while rolling hits and damage simultaneously

I am using the default template to roll on a custom RPG I am playing. At this moment the Macros I use work on the default template and roll hits and damage simultaneously. How can I keep rolling them both at the same time while having the system doubling my dice If I score a Critical on my d20? At this moment these are the commands I've been using; &{template:default} {{name=Rifle}} {{Hit=[[d20+@{MOD}+5]]}} {{Damage=[[d12+2]]}} 

You can do something like this: &{template:default} {{name=Rifle}} [[ [[floor([[d20 + @{MOD} + 5]]/(20 + @{MOD} + 5))*1]]d12[Crit] ]] {{Hit=$[[0]]}} {{Damage=[[d12+2]] + $[[2]]}} Though it isn't the prettiest, and you'll lose the 3d die for the d20 if that bothers you.