Divine Smite Macro Help

Hi I have been making a divine smite macro for the first paladin I am playing. I have come some ways but have encountered a little resistance. Though it is supposed to be 2 separete rolls/queries it seems to mix together(well the second damage is the problem) and I can not figure out why. Any help would be apreciated, also this is the best solution for a smite macro I have come up with thus far but if anyone have any suggestions or changes for a better version that would also be apreciated. &{template:dmg} {{rname=Divine Smite}} {{range=Mele}} {{damage=1}} {{dmg1flag=1}} {{dmg1=?{Crit| No, ?{Spellslot| 1st lvl, [[2d8]] | 2nd lvl, [[3d8]] | 3rd lvl, [[4d8]] | 4th lvl, [[5d8]] | 5th lvl, [[5d8]] } | Yes, ?{Spellslot| 1st lvl, [[4d8]] | 2nd lvl, [[6d8]] | 3rd lvl, [[8d8]] | 4th lvl, [[10d8]] | 5th lvl, [[10d8]] } }}} {{dmg1type=Radiant }} {{damage=1}} {{dmg2flag=1}} {{dmg2=?{Undead/Fiend| No, [[0]]| Yes, ?{Crit| No, [[1d8]] | Yes, [[2d8]] } }}} {{dmg2type=Undead/Fiend }} {{desc=Smite Thy Foe}} ammo= @{Edeir Zolar|charname_output}

Well that did not take long. I fixed it. 2 queries had the same name and I changed one and that fixed it it seems. I will post a neutral divine smite macro that works for everyone to use.  &{template:dmg} {{rname=Divine Smite}} {{range=Mele}} {{damage=1}} {{dmg1flag=1}} {{dmg1=?{Crit| No, ?{Spellslot| 1st lvl, [[2d8]] | 2nd lvl, [[3d8]] | 3rd lvl, [[4d8]] | 4th lvl, [[5d8]] | 5th lvl, [[5d8]] } | Yes, ?{Spellslot| 1st lvl, [[4d8]] | 2nd lvl, [[6d8]] | 3rd lvl, [[8d8]] | 4th lvl, [[10d8]] | 5th lvl, [[10d8]] } }}} {{dmg1type=Radiant }} {{damage=1}} {{dmg2flag=1}} {{dmg2=?{Undead/Fiend| No, [[0]]| Yes, ?{Confirm Crit| No, [[1d8]] | Yes, [[2d8]] } }}} {{dmg2type=Undead/Fiend }} {{desc=Smite Thy Foe}} But for it to work you need to write in ASCII code. Here is it ready for use just remove all - in the text when you copy paste it to the macro. &{template:dmg} {{rname=Divine Smite}} {{range=Mele}} {{damage=1}} {{dmg1flag=1}} {{dmg1=?{Crit| No, ?{Spellslot&#124-; 1st lvl&#44-; [[2d8]] &#124-; 2nd lvl&#44-; [[3d8]] &#124-; 3rd lvl&#44-; [[4d8]] &#124-; 4th lvl&#44-; [[5d8]] &#124-; 5th lvl&#44-; [[5d8]] &#125-; | Yes, ?{Spellslot&#124-; 1st lvl&#44-; [[4d8]] &#124-; 2nd lvl&#44-; [[6d8]] &#124-; 3rd lvl&#44-; [[8d8]] &#124-; 4th lvl&#44-; [[10d8]] &#124-; 5th lvl&#44-; [[10d8]] &#125-; }}} {{dmg1type=Radiant }} {{damage=1}} {{dmg2flag=1}} {{dmg2=?{Undead/Fiend| No, [[0]]| Yes, ?{Confirm Crit&#124-; No&#44-; [[1d8]] &#124-; Yes&#44-; [[2d8]] &#125-; }}} {{dmg2type=Undead/Fiend }} {{desc=Smite Thy Foe}}

The main problem you are running in to is the crit query. Once defined, a query of the same name will use the same result. So the undead/fiend damage is using the same roll on a crit as the original spellslot crit query. There are two things you can do, both require just changing the damage formulas to account for the same crit query. You can combine all of the dice into a single formula like this one. It has the basic premise into the following: [[(normal_dice + undead/fiend dice) * crit]]d6. [[[[(?{Spellslot|1st lvl,1|2nd lvl,2|3rd lvl,3|4th lvl,4|5th lvl,5} + ?{Undead/Fiend|No,0|Yes,1})*?{Crit|No,1|Yes,2}]]d6]] You can keep the separate dice amounts by changing the formulas [[normal_dice * crit]]d6 and [[undead/fiend * crit]]d6 [[[[?{Spellslot|1st lvl,1|2nd lvl,2|3rd lvl,3|4th lvl,4|5th lvl,5}*?{Crit|No,1|Yes,2}]]d6]] [[[[?{Undead/Fiend|No,0|Yes,1}*?{Crit|No,1|Yes,2}]]d6]]