slaguru666/roll20-character-sheets-tester
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Shadowrun5thA] fix edge reroll for limitless rolls + additional reroll info

Browse Source
This commit is contained in:
Stexinator
2022-11-18 12:41:22 +01:00
parent 53e6d00344
commit 3f8379304b
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Shadowrun5th/Shadowrun5th.html
+9 -6
View File
@@ -16713,7 +16713,7 @@ on('clicked:roll', async (event) => {
var reroll = {
dice: results.results.result.dice.length,
successes: results.results.result.result,
limit: results.results.limit_num.result + results.results.limit_mod.result
limit: results.results.limit_num != undefined ? results.results.limit_num.result + results.results.limit_mod.result : 100
}
finishRoll(
@@ -16751,7 +16751,7 @@ on('clicked:repeating_knowledge:roll clicked:repeating_alchemy:roll clicked:repe
var reroll = {
dice: results.results.result.dice.length,
successes: results.results.result.result,
limit: results.results.limit_num.result + results.results.limit_mod.result
limit: results.results.limit_num != undefined ? results.results.limit_num.result + results.results.limit_mod.result : 100
}
finishRoll(
@@ -16885,7 +16885,7 @@ const reroll = async (ev) => {
let attrs = await asw.getAttrs(['gmroll','character_name']);
let rollBase = `${attrs.gmroll}&{template:reroll}{{name=${attrs.character_name}}}{{roll_name=again}}{{dice=[[${roll.dice}]]}}{{prior=[[${roll.successes}]]}}{{limit=Limit}}{{limit_num=[[${roll.limit}]]}}{{result=[[ {[[[[${roll.dice}-${roll.successes}]]d6>5sd+${roll.successes}]], [[{${roll.limit}+0d0}]]}kl1 ]] }}{{passthrough=[[0]]}}`;
let rollBase = `${attrs.gmroll}&{template:reroll}{{name=${attrs.character_name}}}{{roll_name=again}}{{dice=[[${roll.dice}]]}}{{prior=[[${roll.successes}]]}}{{limit=Limit}}{{limit_num=[[${roll.limit}]]}}{{edgeSuccesses=[[0]]}}{{result=[[ {[[[[${roll.dice}-${roll.successes}]]d6>5sd+${roll.successes}]], [[{${roll.limit}+0d0}]]}kl1 ]] }}{{passthrough=[[0]]}}`;
let reroll = await startRoll(rollBase);
let passthrough = 0;
@@ -16895,8 +16895,11 @@ const reroll = async (ev) => {
passthrough = rollEscape.escape(attack);
}
let edgeSuccesses = reroll.results.result.result - roll.successes;
finishRoll(reroll.rollId, {
passthrough: passthrough,
edgeSuccesses: edgeSuccesses
});
}
@@ -17446,17 +17449,17 @@ const asw = (() => {
</tr>
{{#rollGreater() result 1}}
<tr class="sheet-rolltemplate-results-success">
<td class="result">{{result}} Successes</td>
<td class="result"> {{prior}}+{{computed::edgeSuccesses}} = {{result}} Successes</td>
</tr>
{{/rollGreater() result 1}}
{{#rollTotal() result 1}}
<tr class="sheet-rolltemplate-results-success">
<td class="result">{{result}} Success</td>
<td class="result"> {{prior}}+{{computed::edgeSuccesses}} = {{result}} Success</td>
</tr>
{{/rollTotal() result 1}}
{{#rollTotal() result 0}}
<tr class="sheet-rolltemplate-results-fail">
<td class="result">{{result}} Successes</td>
<td class="result"> {{prior}}+{{computed::edgeSuccesses}} = {{result}} Successes</td>
</tr>
{{/rollTotal() result 0}}
{{/result}}