@@ -4284,14 +4297,17 @@ on('clicked:roll', async (event) => {
);
});
-on('clicked:roll_spellcasting_detailed', async (event) => {
+on('clicked:repeating_finearts:roll clicked:repeating_performance:roll clicked:repeating_npcskill:roll', async (event) => {
- let rollBase = "@{whisper}&{template:singleroll} {{title=SPELL CASTING}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{spell_casting_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]?{TARGET LOCATION |None/Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}{{fumble=[[1d10!]]}}{{fumble2=[[1d10!]]}}{{rolllocation=[[0]]}}";
+ // prefix gets an empty string for normal attributes, and repeating_section_ID_ for repeating attributes
+ var trigger = event.triggerName.slice(8); // this always starts with 'clicked:'
+ var prefix = trigger.split('_').slice(0,3).join('_') + '_'
+
+ let rollBase = event.htmlAttributes.value.replaceAll('prefix-', `${prefix}`) + "{{fumble=[[1d10!]]}}{{fumble2=[[1d10!]]}}";
let rollResult = await startRoll(rollBase);
let computedValues = await resolveChecks(
- checkFumble(rollResult),
- checkLocation(rollResult)
+ checkFumble(rollResult)
);
finishRoll(
@@ -4300,14 +4316,9 @@ on('clicked:roll_spellcasting_detailed', async (event) => {
);
});
+on('clicked:roll_spellcasting_detailed', async (event) => {
-on('clicked:repeating_finearts:roll clicked:repeating_performance:roll clicked:repeating_npcskill:roll', async (event) => {
-
- // prefix gets an empty string for normal attributes, and repeating_section_ID_ for repeating attributes
- var trigger = event.triggerName.slice(8); // this always starts with 'clicked:'
- var prefix = trigger.split('_').slice(0,3).join('_') + '_'
-
- let rollBase = event.htmlAttributes.value.replaceAll('prefix-', `${prefix}`) + "{{fumble=[[1d10!]]}}{{fumble2=[[1d10!]]}}";
+ let rollBase = "@{whisper}&{template:singleroll} {{title=SPELL CASTING}} {{name=@{character_name}}} {{roll=[[1d10!+@{will}[STAT]+@{spell_casting_total}[SKILL]?{EXTRA ACTION|No,+0|Yes,-3}[EXTRA ACTION]?{TARGET LOCATION |None/Random,+0|Head,-6|Torso,-1|Arm/Limb,-3|Leg/Tail/Wing,-2}[LOCATION]+?{ADDITIONAL MODS? (Bright Light, No Vision, Terrain etc)|0}[MOD]]]}}{{fumble=[[1d10!]]}}{{fumble2=[[1d10!]]}}{{rolllocation=[[0]]}}";
let rollResult = await startRoll(rollBase);
let computedValues = await resolveChecks(
