Pathfinder 1e Token Action macro for Pathfinder by Roll20 character sheet

I have been crafting a macro that adds an exploding D6 to a skill check, but limited to charisma_mod "explosions" I use the Pathfinder by Roll20 Character Sheet, and I am a Pro member. Currently, I have coded this: @{Octavia Thalre|whispertype} Derring Do - ?{Derring Do|Acrobatics,Acrobatics [[1d20+@{Octavia Thalre|acrobatics}+1d6!]]| Climb,Climb [[1d20+@{Octavia Thalre|climb}+1d6!]]| Escape Artist,Escape Artist [[1d20+@{Octavia Thalre|escape_artist}+1d6!]]| Fly,Fly [[1d20+@{Octavia Thalre|fly}+1d6!]]| Ride,Ride [[1d20+@{Octavia Thalre|ride}+1d6!]]| Swim,Swim[[1d20+@{Octavia Thalre|swim}+1d6!]] } But, there is no limit on the exploding dice.  Not Good. I can do this in chat: [[{{1d6!}, 0d1+18}kl1]] What I need to do is replace the 1d6! with something like: [[{{1d6!}, 0d1+6*@{Octavia Thalre|charisma_mod}}kl1]] I am looking for it to generate an exploding D6 with a result ranging from 1 to no more than charisma_mod*6, and add that to the skill check. As you can see, the macro math works out, capping the result at 18, but I need to cap it at charisma_mod (currently 3 for this character) * 6

Whelp, I found the problem(s) and fixed it! Working PF1e Swashbuckler Derring Do: @{Octavia Thalre|whispertype} &{template:pc} {{showchar=[[1]]}} {{charname=Octavia}} {{name=Derring Do}} {{type=skill}} {{roll= ?{Derring Do| Acrobatics,Acrobatics [[1d20+@{acrobatics}+{1d6!},0d1+3*@{charisma_mod}}kl1]]| Climb,Climb [[1d20+@{climb}+{1d6!},0d1+3*@{charisma_mod}}kl1]]| Escape Artist,Escape Artist [[1d20+@{escape_artist}+{1d6!},0d1+3*@{charisma_mod}}kl1]]| Fly,Fly [[1d20+@{fly}+{1d6!},0d1+3*@{charisma_mod}}kl1]]| Ride,Ride [[1d20+@{ride}+{1d6!},0d1+3*@{charisma_mod}}kl1]]| Swim,Swim [[1d20+@{swim}+{1d6!},0d1+3*@{charisma_mod}}kl1]] } }}