Question about a Magus's damage

[jyster]

L5/L1 Magus/Bard using spell strike and Shocking Grasp with his scimitar.

Battle Dance +2 Hit, +2 Damage 4+Cha Bonus in Rds

Scimitar 1d6 damage Crit 18-20/x2
2 battle dance = 1d6+02 Damage
Shocking grasp = 5d6

So does the battle dance from dervish dawnflower add to both the scimitar damage and the shocking grasp damage?

[Chris Lambertz]

Moved thread.

[Deadmanwalking]

You only get to add it once. You do also get to add Dex from Dervish Dance, though, so that's nice.