Skip to content

Commit

Permalink
Merge pull request Roll20#13303 from Wagii/master
Browse files Browse the repository at this point in the history
Master
  • Loading branch information
NorWhal authored Sep 12, 2024
2 parents 6097f1d + adfde02 commit 55b9424
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions BREAK!!/BREAK.html
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
getAttrs(["character_name"], function(values) {
var character_name = values["character_name"]||"";

const rollString = "@{rollWhisperType} &{template:carac} {{charName=" + character_name + "}} {{rollName=" + attribute + " " + squareNumber + "}} {{roll1=[[2d20]]}} {{modifier=[[?{Modifiers|0}]]}} {{rollType=[[?{Roll Type|Basic, 0|Edge, 1|Snag, -1}]]}} {{total=[[0]]}} {{attribute=[[0]]}} {{result=[[0]]}}";
const rollString = "@{rollWhisperType} &{template:carac} {{charName=" + character_name + "}} {{rollName=" + attribute + " " + squareNumber + "}} {{modifier=[[?{Modifiers|0}]]}} {{rollType=[[?{Roll Type|Basic, 0|Edge, 1|Snag, -1}]]}} {{roll1=[[[[1+abs(?{Roll Type})]]d20]]}} {{total=[[0]]}} {{attribute=[[0]]}} {{result=[[0]]}}";

startRoll(rollString, function(results) {
const l_roll1 = results.results.roll1;
Expand Down Expand Up @@ -397,7 +397,7 @@
var attribute = parseInt(values[`${attributeName}_total`])||0;
var character_name = values["character_name"]||"";

const rollString = "@{rollWhisperType} &{template:carac} {{charName=" + character_name + "}} {{rollName=" + attributeName + "}} {{roll1=[[2d20]]}} {{modifier=[[?{Modifiers|0}]]}} {{attribute=[[0]]}} {{rollType=[[?{Roll Type|Basic, 0|Edge, 1|Snag, -1}]]}} {{total=[[0]]}} {{result=[[0]]}}";
const rollString = "@{rollWhisperType} &{template:carac} {{charName=" + character_name + "}} {{rollName=" + attributeName + "}} {{modifier=[[?{Modifiers|0}]]}} {{attribute=[[0]]}} {{rollType=[[?{Roll Type|Basic, 0|Edge, 1|Snag, -1}]]}} {{roll1=[[[[1+abs(?{Roll Type})]]d20]]}} {{total=[[0]]}} {{result=[[0]]}}";

startRoll(rollString, function(results) {
const l_roll1 = results.results.roll1;
Expand Down

0 comments on commit 55b9424

Please sign in to comment.