jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'version-2-dev' of https://github.com/ThaumRystra/DiceCloud into version-2-dev

Browse Source
This commit is contained in:
Stefan Zermatten
2022-11-22 02:34:38 +02:00
parent 254390e1c1 ad2f43712d
commit 0f12c98408
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/imports/api/engine/actions/applyPropertyByType/applyAction.js
View File

@@ -163,8 +163,9 @@ function rollAttack(attack, scope) {
value = rollDice(1, 20)[0]; value = rollDice(1, 20)[0];
resultPrefix = `1d20 [${value}] ${rollModifierText}` resultPrefix = `1d20 [${value}] ${rollModifierText}`
} }
scope['$attackRoll'] = { value }; scope['$attackDiceRoll'] = { value };
const result = value + attack.value; const result = value + attack.value;
scope['$attackRoll'] = { result };
const { criticalHit, criticalMiss } = applyCrits(value, scope); const { criticalHit, criticalMiss } = applyCrits(value, scope);
return { resultPrefix, result, value, criticalHit, criticalMiss }; return { resultPrefix, result, value, criticalHit, criticalMiss };
} }

2
app/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "dicecloud", "name": "dicecloud",
"version": "2.0.43", "version": "2.0.44",
"description": "Unofficial Online Realtime D&D 5e App", "description": "Unofficial Online Realtime D&D 5e App",
"license": "GPL-3.0", "license": "GPL-3.0",
"repository": { "repository": {

2
app/private/docs/property/skill.md
View File

@@ -1,6 +1,6 @@
# Skills # Skills
Skills represent things the creature can be proficient in. Skills can have their values or behavior modifier by [effects](/docs/property/effect), and their proficiencies modified by [proficiencies](/docs/property/proficiency). Skills represent things the creature can be proficient in. Skills can have their values or behavior modified by [effects](/docs/property/effect), and their proficiencies modified by [proficiencies](/docs/property/proficiency).
--- ---