Spot the link / entityClass error!

templates/apps/ability-use.html

@@ -1,26 +1,41 @@
 <form id="ability-use-form">
-    <p>{{ localize "SW5E.AbilityUseHint" }} <strong>{{item.name}}</strong> {{ localize "SW5E.Ability" }}.</p>
+    <p>{{ title }}</p>
+    <p class="notes">{{note}}</p>
+    {{#each errors}}
+    <p class="notification error">{{localize this}}</p>
+    {{/each}}
 
-    <p type="note">
-    {{#if recharges}}
-    {{ localize "SW5E.AbilityUseRechargeHint" }} <strong>{{#if isCharged}}{{ localize "SW5E.AbilityUseCharged" }}{{else}}{{ localize "SW5E.AbilityUseDepleted" }}{{/if}}</strong>.</p>
-    {{else}}
-    {{ localize "SW5E.AbilityUseWarnStart" }} <strong>{{uses.value}} {{ localize "SW5E.of" }} {{uses.max}}</strong> {{ localize "SW5E.AbilityUseWarnEnd" }} {{perLabel}}.
-    {{/if}}
-    {{#unless canUse}}
-    {{ localize "SW5E.AbilityUseCantUse" }}
-    {{/unless}}
-    </p>
+    {{#if canUpcast}}
+    <div class="form-group">
+        <label>{{ localize "SW5E.PowerCastUpcast" }}</label>
+        <div class="form-fields">
+            <select name="level" {{#unless canUpcast}}disabled{{/unless}}>
+                {{#select item.data.level}}
+                {{#each powerLevels as |l|}}
+                <option value="{{l.level}}" {{#unless l.canCast}}disabled{{/unless}}>{{l.label}}</option>
+                {{/each}}
+                {{/select}}
+            </select>
+        </div>
+    </div>
 
     <div class="form-group">
-        <label class="checkbox">{{ localize "SW5E.AbilityUseConsume" }} <input type="checkbox" name="consume" {{checked consume}}/></label>
-
-        {{#if hasPlaceableTemplate}}
-        <div class="form-group">
-            <label class="checkbox">{{ localize "SW5E.PlaceTemplate" }}
-                <input type="checkbox" name="placeTemplate" checked/>
-            </label>
-        </div>
-        {{/if}}
+        <label class="checkbox"><input type="checkbox" name="consumeSlot" checked/>{{ localize "SW5E.PowerCastConsume" }}</label>
     </div>
+    {{/if}}
+
+    {{#if hasLimitedUses}}
+    <div class="form-group">
+        <label class="checkbox"><input type="checkbox" name="consumeUse" checked/>{{ localize "SW5E.AbilityUseConsume" }}</label>
+    </div>
+    {{/if}}
+
+    {{#if hasPlaceableTemplate}}
+    <div class="form-group">
+        <label class="checkbox">
+            <input type="checkbox" name="placeTemplate" checked/>
+            {{ localize "SW5E.PlaceTemplate" }}
+        </label>
+    </div>
+    {{/if}}
 </form>

templates/apps/actor-flags.html

@@ -24,7 +24,7 @@
         <input type="text" name="{{key}}" value="{{flag.value}}" placeholder="{{flag.placeholder}}" data-dtype="{{flag.type}}"/>
         {{/if}}
 
-        <p class="notes">{{flag.hint}}</p>
+        <p class="notes">{{localize flag.hint}}</p>
     </div>
     {{/each}}
     {{/each}}

templates/apps/long-rest.html

@@ -0,0 +1,20 @@
+<form id="long-rest" class="dialog-content" onsubmit="event.preventDefault();">
+   <p>Take a long rest? On a long rest you will recover hit points, half your maximum hit dice, class resources, limited use item charges, and power points.</p>
+
+    {{#if promptNewDay}}
+    <div class="form-group">
+        <label>Is New Day?</label>
+        <input type="checkbox" name="newDay" {{checked newDay}}/>
+        <p class="hint">Recover limited use abilities which recharge "per day"?</p>
+    </div>
+    {{/if}}
+
+    <div class="dialog-buttons">
+        {{#each buttons as |button id|}}
+        <button class="dialog-button" data-button="{{id}}">
+            {{{button.icon}}}
+            {{{button.label}}}
+        </button>
+        {{/each}}
+    </div>
+</form>

templates/apps/short-rest.html

@@ -18,6 +18,15 @@
         <p class="notes">{{ localize "SW5E.ShortRestNoHD" }}</p>
         {{/unless}}
     </div>
+    
+    {{#if promptNewDay}}
+    <div class="form-group">
+        <label>Is New Day?</label>
+        <input type="checkbox" name="newDay" {{checked newDay}}/>
+        <p class="hint">Recover limited use abilities which recharge "per day"?</p>
+    </div>
+    {{/if}}
+
     <div class="dialog-buttons">
         {{#each buttons as |button id|}}
         <button class="dialog-button" data-button="{{id}}">

templates/apps/spell-cast.html

@@ -1,34 +0,0 @@
-<form id="spell-config-form">
-    <p>{{ localize "DND5E.SpellCastHint" }} <strong>{{item.name}}</strong> {{ localize "DND5E.spell" }}.</p>
-
-    {{#unless canCast}}
-    <p class="notification error">{{ localize "DND5E.SpellCastNoSlots" }}</p>
-    {{/unless}}
-
-    <div class="form-group">
-        <label>{{ localize "DND5E.SpellCastUpcast" }}</label>
-        <div class="form-fields">
-            <select name="level">
-                {{#select item.data.level}}
-                {{#each spellLevels as |l|}}
-                <option value="{{l.level}}" {{#unless l.canCast}}disabled{{/unless}}>{{l.label}}</option>
-                {{/each}}
-                {{/select}}
-            </select>
-        </div>
-    </div>
-
-    <div class="form-group">
-        {{#if canUpcast}}
-        <label class="checkbox">{{ localize "DND5E.SpellCastConsume" }} <input type="checkbox" name="consume" {{checked canCast}}/></label>
-        {{/if}}
-
-        {{#if hasPlaceableTemplate}}
-        <div class="form-group">
-            <label class="checkbox">{{ localize "DND5E.PlaceTemplate" }}
-                <input type="checkbox" name="placeTemplate" checked/>
-            </label>
-        </div>
-        {{/if}}
-    </div>
-</form>

templates/apps/trait-selector.html

@@ -9,9 +9,11 @@
         </li>
         {{/each}}
     </ol>
+    {{#if allowCustom}}
     <div class="form-group stacked">
         <label>{{ localize "SW5E.TraitSelectorSpecial" }}</label>
         <input type="text" name="custom" value="{{custom}}" data-dtype="String"/>
     </div>
+    {{/if}}
     <button type="submit" name="submit" value="1"><i class="far fa-save"></i> {{ localize "SW5E.Save"}}</button>
 </form>