Macro Assistance 3.5 (Psion)

I am trying to work on macros for a psionic character. The issue I'm running into are the augment effects and the different element effects on certain powers. For example: https://www.d20srd.org/srd/psionic/powers/energyPush.htm

Is there any way to make queries to change the rolls/damage calculations based on the element? So far the only way I've found to do it is create a macro for each different element separately and even then getting the extra damage per dice rolled on both the fire/cold/sonic elements of the spell above eludes me.

Cold

A blast of this energy type deals +1 point of damage per die (damage from impact remains at 2d6 points). The saving throw to reduce damage from a cold push is a Fortitude save instead of a Reflex save.

Fire

A blast of this energy type deals +1 point of damage per die (damage from impact remains at 2d6 points).

Sonic

A blast of this energy type deals -1 point of damage per die (damage from impact remains at 2d6 points) and ignores an object’s hardness.

Macro I'm using

&{template:DnD35StdRoll} {{spellflag=true}} {{name=@{character_name} }} {{subtags=casts [Energy Push!](https://www.d20srd.org/srd/psionic/powers/energyPush.htm).}} {{Discipline:= Psychokinetic}} {{Level:= Psi/Wil 2}} {{Display:=Auditory and Visual}} {{Manifesting Time:=1 std action}} {{Range: = [[@{level2}* 10+100]] ft}} {{Effect:= Ray}} {{Duration:= Instantaneous}} {{Saving Throw:= Reflex Half or Fortitude Half}} {{Power Resist:= Yes}} {{Power Points:= 3}} {{Caster level check: = [[10+@{int-mod}+{4}]] vs Saving throw.}} {{Damage=hitting for [[2d6]] Lightning damage}} {{Augment Cost:= [[?{Augment?|0}*2]] }} {{Augment Effect=augmented for an extra [[?{Augment?|0}d6]] Lightning damage}}

Any advice or help on the matter would be appreciated.

Welcome to the world of hurt that is nested queries for variable outputs ;)

The below is untested but should work, you'll need to replace the bit in bold with the correct attribute call for the base DC (been a while since I've used the 3.5e sheet):

&{template:DnD35StdRoll} {{spellflag=true}} {{name=@{character_name} }} {{subtags=casts [Energy Push!](https://www.d20srd.org/srd/psionic/powers/energyPush.htm).}} {{Discipline:= Psychokinetic}} {{Level:= Psi/Wil 2}} {{Display:=Auditory and Visual}} {{Manifesting Time:=1 std action}} {{Range: = [[@{level2}* 10+100]] ft}} {{Effect:= Ray}} {{Duration:= Instantaneous}} {{Caster level check: = [[10+@{int-mod}+{4}]] vs Saving throw.}} {{Power Resist:= Yes}} {{Power Points:= [[ 3[base] + (?{Augment (2PP each)|0}*2)[augment] ]]}} {{Type:= ?{Type|Cold,Cold}} {{Saving Throw:= Fortitude Half (DC[[ INSERT APPROPRIATE SAVE DC ATTRIBUTE CALL HERE[base] + ?{Augment (2PP each)}[augment] ]])}} {{Damage:= [[ 2d6+2[base] + (?{Augment (2PP each)}d6+?{Augment (2PP each)})[augment] ]] cold damage|Electricity,Electricity}} {{Saving Throw:= Reflex Half (DC[[ INSERT APPROPRIATE SAVE DC ATTRIBUTE CALL HERE[base] + ?{Augment (2PP each)}[augment] + 2[type] ]])}} {{Damage:= [[ 2d6[base] + ?{Augment (2PP each)}d6[augment] ]] electricity damage|Fire,Fire}} {{Saving Throw:= Reflex Half (DC[[ INSERT APPROPRIATE SAVE DC ATTRIBUTE CALL HERE[base] + ?{Augment (2PP each)}[augment] ]])}} {{Damage:= [[ 2d6+2[base] + (?{Augment (2PP each)}d6+?{Augment (2PP each)})[augment] ]] fire damage|Sonic,Sonic}} {{Saving Throw:= Reflex Half (DC[[ INSERT APPROPRIATE SAVE DC ATTRIBUTE CALL HERE[base] + ?{Augment (2PP each)}[augment] ]])}} {{Damage:= [[ 2d6-2[base] + (?{Augment (2PP each)}d6-?{Augment (2PP each)})[augment] ]] sonic damage (ignoring object hardness)} }} {{Effect:= Str v DC or pushed back 5 feet (+5' per 5 damage) taking [[ 2d6[base] + ?{Augment (2PP each)}d6[augment] ]] damage from any impact.}}

The key is to try to not put more into a query than necessary but with psionics you often have a lot of variation to account for!