diff --git a/5eShaped/5eShaped.html b/5eShaped/5eShaped.html index 17df244972..e0f7f63dd5 100644 --- a/5eShaped/5eShaped.html +++ b/5eShaped/5eShaped.html @@ -1,5 +1,5 @@ -
Shaped v
Dungeons & Dragons (5th edition)
/
y p
+
=
+
+
=
+
+
=
+
+
=
+
+
=
+
+
=
+
()
+
=
/
/
/
/
/
/
/
/
✖
✖
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
2
3
5
6
7
9
10
11
13
/
?
1
2
3
4
5
6
A
y
/
.
+
.
+
=
.
+
+
?
.
+
+
?
.
.
/
/
/
y
.
+
=
.
+
+
?
.
+
+
?
.
+
+
+
.
,
( )
+
=
/
/
/
/
/
/
/
+
()
+
=
+
()
+
=
+
()
+
=
+
()
+
=
+
()
+
=
+
()
+
=
,
,
,
,
,
()
,
/
y
.
+
=
.
+
+
?
.
+
+
?
.
+
+
+
.

y
.
+
.
+
=
.
+
+
?
.
+
+
?
.

y
.
+
.
+
=
.
+
+
?
.
+
+
?
.

 
y
.
+
.
+
=
.
+
+
?
.
+
+
?
.

y
.
+
.
+
=
.
+
+
?
.
+
+
?
.

y
.
+
.
+
=
.
+
+
?
.
+
+
?
.
123456789
y
:
:
:
( )
:
:
.
.
+
.
+
=
.
+
+
?
.
+
+
?
.
+
+
+
.
.
.
A
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
2
3
5
6
7
9
10
11
13
/
?
+
=
/
/
×
=
/
×
=
?
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
2
3
5
6
7
9
10
11
13
/
A
?
?
y
?
p
Documentation: https://docs.google.com/document/d/1yPcIZ_bIc3JlnWsKZt2tAB0EQSIVEfeMtT0GifbpJIg
- +
Shaped v
Dungeons & Dragons (5th edition)
/
y p
+
=
+
+
=
+
+
=
+
+
=
+
+
=
+
+
=
+
()
+
=
/
/
/
/
/
/
/
/
✖
✖
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
2
3
5
6
7
9
10
11
13
/
?
1
2
3
4
5
6
A
y
/
.
+
.
+
=
.
+
+
?
.
+
+
?
.
.
/
/
/
y
.
+
=
.
+
+
?
.
+
+
?
.
+
+
+
.
,
( )
+
=
/
/
/
/
/
/
/
+
()
+
=
+
()
+
=
+
()
+
=
+
()
+
=
+
()
+
=
+
()
+
=
,
,
,
,
,
()
,
/
y
.
+
=
.
+
+
?
.
+
+
?
.
+
+
+
.

y
.
+
.
+
=
.
+
+
?
.
+
+
?
.

y
.
+
.
+
=
.
+
+
?
.
+
+
?
.

 
y
.
+
.
+
=
.
+
+
?
.
+
+
?
.

y
.
+
.
+
=
.
+
+
?
.
+
+
?
.

y
.
+
.
+
=
.
+
+
?
.
+
+
?
.
123456789
y
:
:
:
( )
:
:
.
.
+
.
+
=
.
+
+
?
.
+
+
?
.
+
+
+
.
.
.
A
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
2
3
5
6
7
9
10
11
13
/
?
+
=
/
/
×
=
/
×
=
?
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
/
+
=
2
3
5
6
7
9
10
11
13
/
A
?
?
y
?
p
Documentation: https://docs.google.com/document/d/1yPcIZ_bIc3JlnWsKZt2tAB0EQSIVEfeMtT0GifbpJIg
+
@@ -91,10 +91,10 @@ {{/text_top}} {{#roll1}}
-
-
{{roll1}}
+
+
{{roll1}}
{{#roll2}} -
{{roll2}}
+
{{roll2}}
{{/roll2}}
{{#vs_ac}} @@ -149,31 +149,32 @@
{{/saving_throw_dc}} {{#damage}} -
-
-
- {{damage}} - {{#rollWasCrit() roll1}} - + {{crit_damage}} - {{/rollWasCrit() roll1}} - {{#^rollWasCrit() roll1}} - {{#rollWasCrit() roll2}} +
+
+
+
+ {{damage}} + {{#rollWasCrit() roll1}} + {{crit_damage}} - {{/rollWasCrit() roll2}} - {{/^rollWasCrit() roll1}} -
-
- {{damage_type}} - {{^damage_type}} - damage - {{/damage_type}} + {{/rollWasCrit() roll1}} + {{#^rollWasCrit() roll1}} + {{#rollWasCrit() roll2}} + + {{crit_damage}} + {{/rollWasCrit() roll2}} + {{/^rollWasCrit() roll1}} +
+
+ {{damage_type}} + {{^damage_type}} + damage + {{/damage_type}} +
{{/damage}} {{#second_damage}} - {{#damage}} -
+
+
@@ -181,23 +182,25 @@ {{^damage}}
{{/damage}} -
-
- {{second_damage}} - {{#rollWasCrit() roll1}} - + {{second_crit_damage}} - {{/rollWasCrit() roll1}} - {{#^rollWasCrit() roll1}} - {{#rollWasCrit() roll2}} +
+
+
+ {{second_damage}} + {{#rollWasCrit() roll1}} + {{second_crit_damage}} - {{/rollWasCrit() roll2}} - {{/^rollWasCrit() roll1}} -
-
- {{second_damage_type}} - {{^second_damage_type}} - damage - {{/second_damage_type}} + {{/rollWasCrit() roll1}} + {{#^rollWasCrit() roll1}} + {{#rollWasCrit() roll2}} + + {{second_crit_damage}} + {{/rollWasCrit() roll2}} + {{/^rollWasCrit() roll1}} +
+
+ {{second_damage_type}} + {{^second_damage_type}} + damage + {{/second_damage_type}} +
{{^damage}} diff --git a/5eShaped/precompiled/components/sheetWorkers.js b/5eShaped/precompiled/components/sheetWorkers.js index 3c28d58ffd..1c97384049 100644 --- a/5eShaped/precompiled/components/sheetWorkers.js +++ b/5eShaped/precompiled/components/sheetWorkers.js @@ -1,7 +1,7 @@ /* global setAttrs:false, getAttrs:false, on:false, getSectionIDs:false, generateRowID:false, getTranslationByKey:false */ 'use strict'; -const currentVersion = '4.3.0'; +const currentVersion = '4.3.1'; const SKILLS = { ACROBATICS: 'dexterity', ANIMALHANDLING: 'wisdom', diff --git a/5eShaped/precompiled/package.json b/5eShaped/precompiled/package.json index 0badd8cdc6..726d22deff 100644 --- a/5eShaped/precompiled/package.json +++ b/5eShaped/precompiled/package.json @@ -1,6 +1,6 @@ { "name": "5eShaped", - "version": "4.3.0", + "version": "4.3.1", "bin": "./", "description": "5e Shaped character sheet for Roll20.net", "main": "gulpfile.js",