Merge remote-tracking branch 'origin/master' into 037-actor-type-creature

src/templates/actor/partials/spells-overview.hbs

@@ -2,25 +2,32 @@
 {{!-- INLINE PARTIAL DEFINITIONS --}}
 {{!-- ======================================================================== --}}
 
-
-{{!-- 
-!-- Two templates for displaying values with unit.
+{{!--
+!-- Base template to display a value with unit.
 !-- @param unitDatum: the object to display; must have a value and a unit attribute
 !-- @param localizationString
-!-- @param config: the config object
+!-- @param unitNames: mapping of allowed unitDatum.unit values to localized unit name
+!-- @param unitAbbrs: mapping of allowed unitDatum.unit values to unit abbreviation
+--}}
+{{#*inline "unit"}}
+<div class="unit-data-pair item-num-val"
+    title="{{localize localizationString}} [{{lookup unitNames unitDatum.unit}}]" >
+    {{#if unitDatum.value }}
+    {{unitDatum.value}}{{lookup unitAbbrs unitDatum.unit}}
+    {{else}}-{{/if}}
+</div>
+{{/inline}}
+{{!-- 
+!-- Two templates based on the "unit" template for displaying values with unit.
+!-- Both accept a `config` object holding the unitNames and unitAbbr instead of
+!-- directly handing over the latter two.
 --}}
 {{#*inline "temporalUnit"}}
-<div class="unit-data-pair item-num-val"
-    title="{{localize localizationString}} [{{lookup config.temporalUnits unitDatum.unit}}]" >
-    {{unitDatum.value}}{{lookup config.temporalUnitsAbbr unitDatum.unit}}
-</div>
+{{> unit unitNames=config.temporalUnits unitAbbrs=config.temporalUnitsAbbr unitDatum=unitDatum localizationString=localizationString}}
 {{/inline}}
 
 {{#*inline "distanceUnit"}}
-<div class="unit-data-pair item-num-val"
-    title="{{localize localizationString}} [{{lookup config.distanceUnits unitDatum.unit}}]" >
-    {{unitDatum.value}}{{lookup config.distanceUnitsAbbr unitDatum.unit}}
-</div>
+{{> unit unitNames=config.distanceUnits unitAbbrs=config.distanceUnitsAbbr unitDatum=unitDatum localizationString=localizationString}}
 {{/inline}}
 
 

src/templates/roll/roll-options.hbs

@@ -0,0 +1,16 @@
+<form class="{{cssClass}} grid">
+    <label for="ctv">{{localize "DS4.RollDialogTargetLabel"}}</label>
+    <input id="ctv" data-type="Number" type="number" name="ctv" value="{{checkTargetValue}}" />
+    <label for="gmmod">{{localize "DS4.RollDialogModifierLabel"}}</label>
+    <input id="gmmod" data-type="Number" type="number" name="gmmod" value="0" />
+    <label for="maxcoup">{{localize "DS4.RollDialogCoupLabel"}}</label>
+    <input id="maxcoup" data-type="Number" type="number" name="maxcoup" value="{{maxCritSuccess}}" />
+    <label for="minfumble">{{localize "DS4.RollDialogFumbleLabel"}}</label>
+    <input id="minfumble" data-type="Number" type="number" name="minfumble" value="{{minCritFailure}}" />
+    <label for="visibility">{{localize "DS4.RollDialogVisibilityLabel"}}</label>
+    <select id="visibility" data-type="String">
+        {{#each rollModes as |rollMode|}}
+            <option value="{{rollMode}}">{{lookup ../config.chatVisibilities rollMode}}</option>
+        {{/each}}
+    </select>
+</form>