[Ironsworn] Adding logic for checking rolls against momentum. (#5743)

* Added companion assets and improved styling

* added 3rd set of assets

* cleaned up some duplication

* added ritual assets

* added ritual logic and stylign

* fixed typo

* updated attributes for companions

* removed bonds

* fixed armor type and margin

* cleaned up css duplicates

* added back in bond css

* pushung rececnt

* added all static templates

* updated companions

* fall back to 'arial' instead of 'fantasy'

This allows the sheet to render on linux in Firefox in a readable
manner (instead of being unreadable wingdings)

* (assets) update companion html and tweak styling

* (assets) triage Kindred asset

* (assets) further fine-tune Companion asset styles

* (assets) fix some double-replaced html

* (assets) italicize Move names & tweak styles

* added new changes

* added path assets

* included all assets

* added formatting for divs

* added missing div tags

* cleaned up lists in assets

* fixed face danger

* (assets) standardize html, especially around asset descriptions

* (assets) font size & line height tweaks

* (assets) standardize & style tracks

* (assets) correct minor content errors

* (assets) ensure first ability is properly checked or unchecked and namespace checkboxes

* added momentum checks

* added fixed momentum

* updated burdens to tormented

* updated css colours to new accessible ones

* updated supply and health to use the new momentum
This commit is contained in:
LeeRhodes
2019-12-17 08:52:38 -06:00
committed by Cassie Levett
parent 9aec2538da
commit e085d9c166
2 changed files with 248 additions and 84 deletions
+35 -4
View File
@@ -742,10 +742,10 @@ input.sheet-border-bottom {
}
.sheet-rolltemplate-ironsworn table {
width: 100%;
/*border: 1px solid;*/
border: 1px solid;
color: black;
font-size: 1em;
font-family: Copperplate, "Copperplate Gothic Light", arial;
font-family: Verdana, arial, sans-serif;
margin: 0px;
}
@@ -765,24 +765,55 @@ input.sheet-border-bottom {
color: #ffffff;
line-height: 0.9em;
font-size: 0.9em;
font-family: Rockwell, "Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
font-family: Verdana, arial, sans-serif;
font-variant: small-caps;
font-style: italic;
font-weight: bold;
text-align: left;
padding: 0.5rem 0.5rem 0.2rem 0.5rem;
}
.sheet-rolltemplate-ironsworn .sheet-subfooter {
background-color: #b9b9b6;
line-height: 0.9em;
font-size: 0.9em;
font-family: Rockwell, "Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
font-family: Verdana, arial, sans-serif;
font-variant: small-caps;
font-style: italic;
font-weight: bold;
text-align: left;
}
.sheet-rolltemplate-ironsworn .sheet-alert {
color: white;
background-color: #761818;
}
.sheet-rolltemplate-ironsworn .sheet-opportunity {
color: white;
background-color: #0B3F0B;
}
.sheet-rolltemplate-ironsworn .sheet-strong-hit {
color: white;
background-color: #125812;
}
.sheet-rolltemplate-ironsworn .sheet-weak-hit {
color: white;
background-color: #186251;
}
.sheet-rolltemplate-ironsworn .sheet-miss {
color: white;
background-color: #7D2B1D;
}
.sheet-rolltemplate-ironsworn .sheet-complication {
color: white;
background-color: #761818;
}
.sheet-rolltemplate-ironsworn .userscript-tcat {
font-weight: bold;
}
+213 -80
View File
@@ -155,31 +155,31 @@
<div class="sheet-stats">
<div class="sheet-stat">
<button type="roll" title="Roll +Edge" name="rollEdge"
value="&{template:ironsworn} {{header=@{character_name}}} {{name=Roll +edge}} {{action=[[1d6+@{edge}+?{Modifier|0}]]}} {{challenge1=[[d10]]}} {{challenge2=[[1d10]]}}"></button>
value="&{template:ironsworn} {{header=@{character_name}}} {{name=Roll +edge}} {{action=[[1d6+@{edge}+?{Modifier|0}]]}} {{challenge1=[[d10]]}} {{challenge2=[[1d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{edge}+?{Modifier|0}]]}} {{add=[[?{Modifier|0}]]}} {{stat=[[@{edge}]]}} {{fake_roll=[[0-(@{momentum})]]}} {{momentum_cancel=[[(@{edge}+?{Modifier|0})-(@{momentum})]]}}"></button>
<h3 class="sheet-stats-title">EDGE</h3>
<input type="text" class="sheet-stats-input" name="attr_edge" value="1">
</div>
<div class="sheet-stat">
<button type="roll" title="Roll +Iron" name="rollIron"
value="&{template:ironsworn} {{header=@{character_name}}} {{name=Roll +iron}} {{action=[[1d6+@{iron}+?{Modifier|0}]]}} {{challenge1=[[d10]]}} {{challenge2=[[1d10]]}}"></button>
value="&{template:ironsworn} {{header=@{character_name}}} {{name=Roll +iron}} {{action=[[1d6+@{iron}+?{Modifier|0}]]}} {{challenge1=[[d10]]}} {{challenge2=[[1d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{iron}+?{Modifier|0}]]}} {{add=[[?{Modifier|0}]]}} {{stat=[[@{iron}]]}} {{fake_roll=[[0-(@{momentum})]]}} {{momentum_cancel=[[(@{iron}+?{Modifier|0})-(@{momentum})]]}}"></button>
<h3 class="sheet-stats-title">IRON</h3>
<input type="text" class="sheet-stats-input" name="attr_iron" value="1">
</div>
<div class="sheet-stat">
<button type="roll" title="Roll +Heart" name="rollHeart"
value="&{template:ironsworn} {{header=@{character_name}}} {{name= Roll +heart}} {{action=[[1d6+@{heart}+?{Modifier|0}]]}} {{challenge1=[[d10]]}} {{challenge2=[[1d10]]}}"></button>
value="&{template:ironsworn} {{header=@{character_name}}} {{name= Roll +heart}} {{action=[[1d6+@{heart}+?{Modifier|0}]]}} {{challenge1=[[d10]]}} {{challenge2=[[1d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{heart}+?{Modifier|0}]]}} {{add=[[?{Modifier|0}]]}} {{stat=[[@{heart}]]}} {{fake_roll=[[0-(@{momentum})]]}} {{momentum_cancel=[[(@{heart}+?{Modifier|0})-(@{momentum})]]}}"></button>
<h3 class="sheet-stats-title">HEART</h3>
<input type="text" class="sheet-stats-input" name="attr_heart" value="1">
</div>
<div class="sheet-stat">
<button type="roll" title="Roll +Shadow" name="rollShadow"
value="&{template:ironsworn} {{header=@{character_name}}} {{name=Roll +shadow}} {{action=[[1d6+@{shadow}+?{Modifier|0}]]}} {{challenge1=[[d10]]}} {{challenge2=[[1d10]]}}"></button>
value="&{template:ironsworn} {{header=@{character_name}}} {{name=Roll +shadow}} {{action=[[1d6+@{shadow}+?{Modifier|0}]]}} {{challenge1=[[d10]]}} {{challenge2=[[1d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{shadow}+?{Modifier|0}]]}} {{add=[[?{Modifier|0}]]}} {{stat=[[@{shadow}]]}} {{fake_roll=[[0-(@{momentum})]]}} {{momentum_cancel=[[(@{shadow}+?{Modifier|0})-(@{momentum})]]}}"></button>
<h3 class="sheet-stats-title">SHADOW</h3>
<input type="text" class="sheet-stats-input" name="attr_shadow" value="1">
</div>
<div class="sheet-stat">
<button type="roll" title="Roll +Wits" name="rollWits"
value="&{template:ironsworn} {{header=@{character_name}}} {{name=Roll +wits}} {{action=[[1d6+@{wits}+?{Modifier|0}]]}} {{challenge1=[[d10]]}} {{challenge2=[[1d10]]}}"></button>
value="&{template:ironsworn} {{header=@{character_name}}} {{name=Roll +wits}} {{action=[[1d6+@{wits}+?{Modifier|0}]]}} {{challenge1=[[d10]]}} {{challenge2=[[1d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{wits}+?{Modifier|0}]]}} {{add=[[?{Modifier|0}]]}} {{stat=[[@{wits}]]}} {{fake_roll=[[0-(@{momentum})]]}} {{momentum_cancel=[[(@{wits}+?{Modifier|0})-(@{momentum})]]}}"></button>
<h3 class="sheet-stats-title">WITS</h3>
<input type="text" class="sheet-stats-input" name="attr_wits" value="1">
</div>
@@ -831,13 +831,13 @@
name="attr_debilMarked"><span></span>
</td>
<td width="40%">
<h5>Marked</h5>
<h5>Cursed</h5>
</td>
<td width="10%"><input type="checkbox"
name="attr_debilHaunted"><span></span>
</td>
<td width="40%">
<h5>Haunted</h5>
<h5>Tormented</h5>
</td>
</tr>
<tr>
@@ -870,7 +870,7 @@
<td class="sheet-resources" width="10%">
<div class="sheet-resources-box">
<button type="roll" title="Roll +Health" name="rollHealth"
value="&{template:ironsworn} {{header=@{character_name} Roll +health}} {{name=Endure Harm}} {{action=[[1d6+@{health}+?{Modifier|0}]]}} {{challenge1=[[d10]]}} {{challenge2=[[1d10]]}}"></button>
value="&{template:ironsworn} {{header=@{character_name} Roll +health}} {{name=Endure Harm}} {{action=[[1d6+@{health}+?{Modifier|0}]]}} {{challenge1=[[d10]]}} {{challenge2=[[1d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{health}+?{Modifier|0}]]}} {{add=[[?{Modifier|0}]]}} {{stat=[[@{health}]]}} {{fake_roll=[[0-(@{momentum})]]}} {{momentum_cancel=[[(@{health}+?{Modifier|0})-(@{momentum})]]}}"></button>
<h4>HEALTH</h4>
</div>
<div class="sheet-resources-box">
@@ -899,7 +899,7 @@
</div>
<div class="sheet-resources-title-box">
<button type="roll" title="Roll +Spirit" name="rollSpirit"
value="&{template:ironsworn} {{header=@{character_name} Roll +spirit}} {{name=Test your Spirit}} {{action=[[1d6+@{spirit}+?{Modifier|0}]]}} {{challenge1=[[d10]]}} {{challenge2=[[1d10]]}}"></button>
value="&{template:ironsworn} {{header=@{character_name} Roll +spirit}} {{name=Test your Spirit}} {{action=[[1d6+@{spirit}+?{Modifier|0}]]}} {{challenge1=[[d10]]}} {{challenge2=[[1d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{spirit}+?{Modifier|0}]]}} {{add=[[?{Modifier|0}]]}} {{stat=[[@{spirit}]]}} {{fake_roll=[[0-(@{momentum})]]}} {{momentum_cancel=[[(@{spirit}+?{Modifier|0})-(@{momentum})]]}}"></button>
<h4>SPIRIT</h4>
</div>
<div class="sheet-resources-box">
@@ -928,7 +928,7 @@
</div>
<div class="sheet-resources-title-box">
<button type="roll" title="Roll +Supply" name="rollSupply"
value="&{template:ironsworn} {{header=@{character_name} Roll +supply}} {{name=Make Camp}} {{action=[[1d6+@{supply}+?{Modifier|0}]]}} {{challenge1=[[d10]]}} {{challenge2=[[1d10]]}}"></button>
value="&{template:ironsworn} {{header=@{character_name} Roll +supply}} {{name=Make Camp}} {{action=[[1d6+@{supply}+?{Modifier|0}]]}} {{challenge1=[[d10]]}} {{challenge2=[[1d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{supply}+?{Modifier|0}]]}} {{add=[[?{Modifier|0}]]}} {{stat=[[@{supply}]]}} {{fake_roll=[[0-(@{momentum})]]}} {{momentum_cancel=[[(@{supply}+?{Modifier|0})-(@{momentum})]]}}"></button>
<h4>SUPPLY</h4>
</div>
<div class="sheet-resources-box">
@@ -3091,64 +3091,197 @@
<rolltemplate class="sheet-rolltemplate-ironsworn">
<table>
{{#action}}
<tr>
<td colspan="2" class="sheet-subheader">{{header}}</td>
</tr>
<tr>
<th colspan="2">{{name}}</th>
</tr>
<tr>
<td><span>Action Die: </span></td>
<td><span>{{action}}</span></td>
</tr>
<tr>
<td><span>Challenge Dice: </span></td>
<td><span>{{challenge1}} {{challenge2}}</span></td>
</tr>
{{#rollGreater() action challenge1}}
{{#rollTotal() challenge1 challenge2}}
<!--CHALLENGE DIE MATCH-->
<tr>
<td colspan="2" class="sheet-subfooter" style="color:green;">Opportunity</td>
</tr>
{{/rollTotal() challenge1 challenge2}}
{{#^rollTotal() challenge1 challenge2}}
{{#rollGreater() action challenge2}}
<!--Strong Hit-->
<tr>
<td colspan="2" class="sheet-subfooter" style="color:darkgreen;">Strong Hit</td>
</tr>
{{/rollGreater() action challenge2}}
{{#^rollGreater() action challenge2}}
<!--Weak Hit-->
<tr>
<td colspan="2" class="sheet-subfooter" style="color:gold;">Weak Hit</td>
</tr>
{{/^rollGreater() action challenge2}}
{{/^rollTotal() challenge1 challenge2}}
{{/rollGreater() action challenge1}}
{{#^rollGreater() action challenge1}}
{{#rollTotal() challenge1 challenge2}}
<!--CHALLENGE DIE MATCH-->
<tr>
<td colspan="2" class="sheet-subfooter" style="color:red;">Complication</td>
</tr>
{{/rollTotal() challenge1 challenge2}}
{{#^rollTotal() challenge1 challenge2}}
{{#rollGreater() action challenge2}}
<!--Weak Hit-->
<tr>
<td colspan="2" class="sheet-subfooter" style="color:gold;">Weak Hit</td>
</tr>
{{/rollGreater() action challenge2}}
{{#^rollGreater() action challenge2}}
<!--Miss-->
<tr>
<td colspan="2" class="sheet-subfooter" style="color:firebrick;">Miss</td>
</tr>
{{/^rollGreater() action challenge2}}
{{/^rollTotal() challenge1 challenge2}}
{{/^rollGreater() action challenge1}}
<tr>
<td colspan="2" class="sheet-subheader">{{header}}</td>
</tr>
<tr>
<th colspan="2">{{name}}</th>
</tr>
{{#rollTotal() action momentum_cancel}}
<tr>
<td>Action Die:</td>
<td>{{fake_roll}}</td>
</tr>
<tr>
<td colspan="2" class="sheet-subfooter sheet-alert ">Action die cancelled for matching negative momentum.</td>
</tr>
<tr>
<td>Stat + Add:</td>
<td>{{stat}} + {{add}}</td>
</tr>
<tr>
<td>Action Score:</td>
<td>{{modifiers}}</td>
</tr>
<tr>
<td><span>Challenge Dice: </span></td>
<td><span>{{challenge1}} {{challenge2}}</span></td>
</tr>
{{#rollGreater() modifiers challenge1}}
{{#rollTotal() challenge1 challenge2}}
<!--CHALLENGE DIE MATCH-->
<tr>
<td colspan="2" class="sheet-subfooter sheet-opportunity">Opportunity</td>
</tr>
{{/rollTotal() challenge1 challenge2}}
{{#^rollTotal() challenge1 challenge2}}
{{#rollGreater() modifiers challenge2}}
<!--Strong Hit-->
<tr>
<td colspan="2" class="sheet-subfooter sheet-strong-hit">Strong Hit</td>
</tr>
{{/rollGreater() modifiers challenge2}}
{{#^rollGreater() modifiers challenge2}}
<!--Weak Hit-->
<tr>
<td colspan="2" class="sheet-subfooter sheet-weak-hit">Weak Hit</td>
</tr>
{{/^rollGreater() modifiers challenge2}}
{{/^rollTotal() challenge1 challenge2}}
{{/rollGreater() modifiers challenge1}}
{{#^rollGreater() modifiers challenge1}}
{{#rollTotal() challenge1 challenge2}}
<!--CHALLENGE DIE MATCH-->
<tr>
<td colspan="2" class="sheet-subfooter sheet-complication">Complication</td>
</tr>
{{/rollTotal() challenge1 challenge2}}
{{#^rollTotal() challenge1 challenge2}}
{{#rollGreater() modifiers challenge2}}
<!--Weak Hit-->
<tr>
<td colspan="2" class="sheet-subfooter sheet-weak-hit">Weak Hit</td>
</tr>
{{/rollGreater() modifiers challenge2}}
{{#^rollGreater() modifiers challenge2}}
<!--Miss-->
<tr>
<td colspan="2" class="sheet-subfooter sheet-miss">Miss</td>
</tr>
{{/^rollGreater() modifiers challenge2}}
{{/^rollTotal() challenge1 challenge2}}
{{/^rollGreater() modifiers challenge1}}
{{/rollTotal() action momentum_cancel}}
{{#^rollTotal() action momentum_cancel}}
<tr>
<td><span>Action Score: </span></td>
<td><span>{{action}}</span></td>
</tr>
<tr>
<td><span>Challenge Dice: </span></td>
<td><span>{{challenge1}} {{challenge2}}</span></td>
</tr>
{{#rollGreater() action challenge1}}
{{#rollTotal() challenge1 challenge2}}
<!--CHALLENGE DIE MATCH-->
<tr>
<td colspan="2" class="sheet-subfooter sheet-opportunity">Opportunity</td>
</tr>
{{/rollTotal() challenge1 challenge2}}
{{#^rollTotal() challenge1 challenge2}}
{{#rollGreater() action challenge2}}
<!--Strong Hit-->
<tr>
<td colspan="2" class="sheet-subfooter sheet-strong-hit">Strong Hit</td>
</tr>
{{/rollGreater() action challenge2}}
{{#^rollGreater() action challenge2}}
<!--Weak Hit-->
<tr>
<td colspan="2" class="sheet-subfooter sheet-weak-hit">Weak Hit</td>
</tr>
{{#rollGreater() momentum challenge2}}
<tr>
<td>Momentum:</td>
<td>{{momentum}}</td>
</tr>
<!--Strong Hit-->
<tr>
<td colspan="2" class="sheet-subfooter sheet-strong-hit">Momentum Burn: Strong Hit</td>
</tr>
{{/rollGreater() momentum challenge2}}
{{/^rollGreater() action challenge2}}
{{/^rollTotal() challenge1 challenge2}}
{{/rollGreater() action challenge1}}
{{#^rollGreater() action challenge1}}
{{#rollTotal() challenge1 challenge2}}
<!--CHALLENGE DIE MATCH-->
<tr>
<td colspan="2" class="sheet-subfooter sheet-complication">Complication</td>
</tr>
{{#rollGreater() momentum challenge1}}
<tr>
<td>Momentum:</td>
<td>{{momentum}}</td>
</tr>
<!--Strong Hit-->
<tr>
<td colspan="2" class="sheet-subfooter sheet-strong-hit">Momentum Burn: Strong Hit</td>
</tr>
{{/rollGreater() momentum challenge1}}
{{/rollTotal() challenge1 challenge2}}
{{#^rollTotal() challenge1 challenge2}}
{{#rollGreater() action challenge2}}
<!--Weak Hit-->
<tr>
<td colspan="2" class="sheet-subfooter sheet-weak-hit">Weak Hit</td>
</tr>
{{#rollGreater() momentum challenge1}}
{{#rollGreater() momentum challenge2}}
<tr>
<td>Momentum:</td>
<td>{{momentum}}</td>
</tr>
<!--Strong Hit-->
<tr>
<td colspan="2" class="sheet-subfooter sheet-strong-hit">Momentum Burn: Strong Hit</td>
</tr>
{{/rollGreater() momentum challenge2}}
{{/rollGreater() momentum challenge1}}
{{/rollGreater() action challenge2}}
{{#^rollGreater() action challenge2}}
<!--Miss-->
<tr>
<td colspan="2" class="sheet-subfooter sheet-miss">Miss</td>
</tr>
{{#rollGreater() momentum challenge1}}
{{#rollGreater() momentum challenge2}}
<tr>
<td>Momentum:</td>
<td>{{momentum}}</td>
</tr>
<!--Strong Hit-->
<tr>
<td colspan="2" class="sheet-subfooter sheet-strong-hit">Momentum Burn: Strong Hit</td>
</tr>
{{/rollGreater() momentum challenge2}}
{{#^rollGreater() momentum challenge2}}
<tr>
<td>Momentum:</td>
<td>{{momentum}}</td>
</tr>
<!--Weak Hit-->
<tr>
<td colspan="2" class="sheet-subfooter sheet-weak-hit">Momentum Burn: Weak Hit</td>
</tr>
{{/^rollGreater() momentum challenge2}}
{{/rollGreater() momentum challenge1}}
{{#^rollGreater() momentum challenge1}}
{{#rollGreater() momentum challenge2}}
<tr>
<td>Momentum:</td>
<td>{{momentum}}</td>
</tr>
<!--Weak Hit-->
<tr>
<td colspan="2" class="sheet-subfooter sheet-weak-hit">Momentum Burn: Weak Hit</td>
</tr>
{{/rollGreater() momentum challenge2}}
{{/^rollGreater() momentum challenge1}}
{{/^rollGreater() action challenge2}}
{{/^rollTotal() challenge1 challenge2}}
{{/^rollGreater() action challenge1}}
{{/^rollTotal() action momentum_cancel}}
{{/action}}
{{#vow}}
<tr>
@@ -3169,20 +3302,20 @@
{{#rollTotal() challenge1 challenge2}}
<!--CHALLENGE DIE MATCH-->
<tr>
<td colspan="2" class="sheet-subfooter" style="color:green;">Opportunity</td>
<td colspan="2" class="sheet-subfooter sheet-opportunity">Opportunity</td>
</tr>
{{/rollTotal() challenge1 challenge2}}
{{#^rollTotal() challenge1 challenge2}}
{{#rollGreater() vow challenge2}}
<!--Strong Hit-->
<tr>
<td colspan="2" class="sheet-subfooter" style="color:darkgreen;">Strong Hit</td>
<td colspan="2" class="sheet-subfooter sheet-strong-hit">Strong Hit</td>
</tr>
{{/rollGreater() vow challenge2}}
{{#^rollGreater() vow challenge2}}
<!--Weak Hit-->
<tr>
<td colspan="2" class="sheet-subfooter" style="color:gold;">Weak Hit</td>
<td colspan="2" class="sheet-subfooter sheet-weak-hit">Weak Hit</td>
</tr>
{{/^rollGreater() vow challenge2}}
{{/^rollTotal() challenge1 challenge2}}
@@ -3191,20 +3324,20 @@
{{#rollTotal() challenge1 challenge2}}
<!--CHALLENGE DIE MATCH-->
<tr>
<td colspan="2" class="sheet-subfooter" style="color:red;">Complication</td>
<td colspan="2" class="sheet-subfooter sheet-complication">Complication</td>
</tr>
{{/rollTotal() challenge1 challenge2}}
{{#^rollTotal() challenge1 challenge2}}
{{#rollGreater() vow challenge2}}
<!--Weak Hit-->
<tr>
<td colspan="2" class="sheet-subfooter" style="color:gold;">Weak Hit</td>
<td colspan="2" class="sheet-subfooter sheet-weak-hit">Weak Hit</td>
</tr>
{{/rollGreater() vow challenge2}}
{{#^rollGreater() vow challenge2}}
<!--Miss-->
<tr>
<td colspan="2" class="sheet-subfooter" style="color:firebrick;">Miss</td>
<td colspan="2" class="sheet-subfooter sheet-miss">Miss</td>
</tr>
{{/^rollGreater() vow challenge2}}
{{/^rollTotal() challenge1 challenge2}}
@@ -3229,20 +3362,20 @@
{{#rollTotal() challenge1 challenge2}}
<!--CHALLENGE DIE MATCH-->
<tr>
<td colspan="2" class="sheet-subfooter" style="color:green;">Opportunity</td>
<td colspan="2" class="sheet-subfooter sheet-opportunity">Opportunity</td>
</tr>
{{/rollTotal() challenge1 challenge2}}
{{#^rollTotal() challenge1 challenge2}}
{{#rollGreater() progress challenge2}}
<!--Strong Hit-->
<tr>
<td colspan="2" class="sheet-subfooter" style="color:darkgreen;">Strong Hit</td>
<td colspan="2" class="sheet-subfooter sheet-strong-hit">Strong Hit</td>
</tr>
{{/rollGreater() progress challenge2}}
{{#^rollGreater() progress challenge2}}
<!--Weak Hit-->
<tr>
<td colspan="2" class="sheet-subfooter" style="color:gold;">Weak Hit</td>
<td colspan="2" class="sheet-subfooter sheet-weak-hit">Weak Hit</td>
</tr>
{{/^rollGreater() progress challenge2}}
{{/^rollTotal() challenge1 challenge2}}
@@ -3251,20 +3384,20 @@
{{#rollTotal() challenge1 challenge2}}
<!--CHALLENGE DIE MATCH-->
<tr>
<td colspan="2" class="sheet-subfooter" style="color:red;">Complication</td>
<td colspan="2" class="sheet-subfooter sheet-complication">Complication</td>
</tr>
{{/rollTotal() challenge1 challenge2}}
{{#^rollTotal() challenge1 challenge2}}
{{#rollGreater() progress challenge2}}
<!--Weak Hit-->
<tr>
<td colspan="2" class="sheet-subfooter" style="color:gold;">Weak Hit</td>
<td colspan="2" class="sheet-subfooter sheet-weak-hit">Weak Hit</td>
</tr>
{{/rollGreater() progress challenge2}}
{{#^rollGreater() progress challenge2}}
<!--Miss-->
<tr>
<td colspan="2" class="sheet-subfooter" style="color:firebrick;">Miss</td>
<td colspan="2" class="sheet-subfooter sheet-miss">Miss</td>
</tr>
{{/^rollGreater() progress challenge2}}
{{/^rollTotal() challenge1 challenge2}}