diff --git a/Shadowrun3e/shadowrun3e.html b/Shadowrun3e/shadowrun3e.html index 69d8e6251b..fad3c4ab82 100644 --- a/Shadowrun3e/shadowrun3e.html +++ b/Shadowrun3e/shadowrun3e.html @@ -697,8 +697,6 @@
Dispell:
Resist Banish:
-
-
Astral Space @@ -814,7 +812,7 @@
Conjuring:
-
+
Specialize
@@ -4270,12 +4268,13 @@ buttonlist.forEach(button => { var targetofspell=target; if (target.includes("@{target")) targetofspell="@{target|Target|token_name}" - var calcDice="@{spellcasting} + ?{Magic Pool Dice}"; + var calcDice="?{Sorcery Dice?} + ?{Magic Pool Dice}"; var calcTN= target + " + (2*(@{spellstack}+@{spellsus})) + @{spellmisc} + @{stun_pen} + @{wound_pen}"; var calcDrainTN="floor(" + force + "/2) + " + drain + " + ( 2 * @{spellsus} )"; var calcDrainDice="@{willpower|max} + ?{Drain Pool Dice}"; var myroll="&{template:spell}{{myname=@{character_name}}}"; myroll+="{{draindamage=[[0]]}}" + myroll+="{{sorcerydice=[[?{Sorcery Dice?|@{spellcasting}}]]}}" myroll+="{{spellname=" + name + "}}"; myroll+="{{description=" + description +"}}"; myroll+="{{MagicPool=[[?{Magic Pool Dice|0} + ?{Drain Pool Dice|0}]]}}"; @@ -7017,6 +7016,7 @@ powers: ["Accident", "Divination", "Guard", "Materialization", "Search"]
{{myname}}: {{spellname}} {{castforce}} vs. {{targetofspell}}
Rolling: {{rolldice}}d6 vs. {{targetnumber}}
{{#spelldamage}}
Damage: {{computed::spelldamage}}
{{/spelldamage}} + {{#sorcerydice}}
Sorcery Dice Used: {{sorcerydice}}
{{/sorcerydice}} {{#MagicPool}}
Magic Pool Used: {{MagicPool}}
{{/MagicPool}}
Casting Test: {{casttest}}
{{#draintest}}
Drain Test: {{draintest}} vs. {{computed::draindamage}}
{{/draintest}}