Skip to content

Commit

Permalink
Merge remote-tracking branch 'bracciata/fix/1085/spacing-in-output'
Browse files Browse the repository at this point in the history
  • Loading branch information
kakaroto committed Apr 25, 2024
2 parents b6d6d79 + fc6d700 commit d50480c
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions src/common/roll_renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -464,22 +464,22 @@ class Beyond20RollRenderer {

async rollSkill(request, custom_roll_dice = "") {
const data = { [request.ability]: request.modifier, "custom_dice": custom_roll_dice }
return this.rollD20(request, request.skill + "(" + request.modifier + ")", data, "skill-check");
return this.rollD20(request, request.skill + " (" + request.modifier + ")", data, "skill-check");
}

rollAbility(request, custom_roll_dice = "") {
const data = { [request.ability]: request.modifier, "custom_dice": custom_roll_dice }
return this.rollD20(request, request.name + "(" + request.modifier + ")", data, "ability-check");
return this.rollD20(request, request.name + " (" + request.modifier + ")", data, "ability-check");
}

rollSavingThrow(request, custom_roll_dice = "") {
const data = { [request.ability]: request.modifier, "custom_dice": custom_roll_dice }
return this.rollD20(request, request.name + " Save" + "(" + request.modifier + ")", data, "saving-throw");
return this.rollD20(request, request.name + " Save" + " (" + request.modifier + ")", data, "saving-throw");
}

rollInitiative(request, custom_roll_dice = "") {
const data = { "initiative": request.initiative, "custom_dice": custom_roll_dice }
return this.rollD20(request, "Initiative" + "(" + request.initiative + ")", data, "initiative");
return this.rollD20(request, "Initiative" + " (" + request.initiative + ")", data, "initiative");
}

rollHitDice(request) {
Expand Down Expand Up @@ -701,7 +701,7 @@ class Beyond20RollRenderer {

let source = request["level-school"];
if (request["cast-at"] !== undefined)
source = request["level-school"] + "(Cast at " + request["cast-at"] + " Level)";
source = request["level-school"] + " (Cast at " + request["cast-at"] + " Level)";

if (request.ritual)
data["Ritual"] = "Can be cast as a ritual";
Expand Down Expand Up @@ -829,7 +829,7 @@ class Beyond20RollRenderer {
const mod = request.modifier || request.roll;
const rname = request.name || request.type;

return this.rollDice(request, rname + "(" + mod + ")", mod, {});
return this.rollDice(request, rname + " (" + mod + ")", mod, {});
}
}
}
4 changes: 2 additions & 2 deletions src/common/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -1165,9 +1165,9 @@ function setVTTTabSetting(name, settings) {
"This " + current_campaign,
"This Specific Tab"];
if (current_vtt == vtt) {
new_options.push("Another tab || " + campaign.toLowerCase() + "(No change)");
new_options.push("Another tab || " + campaign.toLowerCase() + " (No change)");
} else {
new_options.push("A " + vtt_name + " " + campaign.toLowerCase() + "(No change)");
new_options.push("A " + vtt_name + " " + campaign.toLowerCase() + " (No change)");
}
}
} else {
Expand Down
4 changes: 2 additions & 2 deletions src/dndbeyond/content-scripts/character.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ async function rollSkillCheck(paneClass) {
modifier = mod >= 0 ? `+${mod}` : `${mod}`;
}
}
//console.log("Skill " + skill_name + "(" + ability + ") : " + modifier);
//console.log("Skill " + skill_name + " (" + ability + ") : " + modifier);
const roll_properties = {
"skill": skill_name,
"ability": ability,
Expand Down Expand Up @@ -2000,7 +2000,7 @@ function injectRollButton(paneClass) {
const id = addRollButton(character, async () => {
const props = await buildAttackRoll(character,
"action",
spell_name + "(" + sizeStr + ")",
spell_name + " (" + sizeStr + ")",
sizeStr + " animated object",
{},
[dmg],
Expand Down
2 changes: 1 addition & 1 deletion src/roll20/content-script.js
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ function rollSpellCard(request) {
}

if (request["cast-at"] !== undefined)
properties["level"] = request["level-school"] + "(Cast at " + request["cast-at"] + " Level)";
properties["level"] = request["level-school"] + " (Cast at " + request["cast-at"] + " Level)";
else
properties["level"] = request["level-school"];

Expand Down

0 comments on commit d50480c

Please sign in to comment.