Damage Roll – How is the Pool Built?

In the Combat Section for Damage it says:

The Dice pool is equal to the Attribute used in the attack + the DM of the weapon or effect + any excess successes from the attack roll.

Example (With a DM +2 and Ability +3): After rolling your Attack (Ability + Skill) and Comparing to Defense, you have 2 Excess Successes. The Damage Roll is Ability + DM + Excess Successes, which is a Dice Pool of 3 (Ability) +2 (DM) +2 (Excess) = 7

—–

In the Melee / Ranged Skill Sections it says:

Roll a number of dice equal to your Ability plus your skill levels minus the complexity of the weapon. Compare the result to the target’s Avoidance Defense. Add remaining successes to the weapon’s DM (see Damage page 190).

Example (With a DM +2 and Ability +3): After rolling your Attack (Ability + Skill) and Comparing to Defense, you have 2 Excess Successes. The Damage Roll is DM + Excess Successes, which is a Dice Pool of 2 (DM) +2 (Excess) = 4

===========

Question 1: For Melee Weapons which have a DM expressed as “+X”, do you add your Ability in for the Damage Roll (assuming at least 1 Excess Success on the Attack)?

Question 2: For Ranged Weapons which have a DM expressed as a fixed “X”, do you roll the Ability in for Damage or just the base DM?

John