DND5e Core 1.2.0

DND5e Core update 1.2.0 modded to SW5e

templates/actors/character-sheet.html

@@ -81,9 +81,10 @@
                     </footer>
                 </li>
 
-                <li class="attribute">
+                <li class="attribute movement">
                     <h4 class="attribute-name box-title">
-                        {{ localize "SW5E.Speed" }}
+                        {{ localize "SW5E.Movement" }}
+                        <a class="config-button" data-action="movement" title="{{localize 'SW5E.MovementConfig'}}"><i class="fas fa-cog"></i></a>
                     </h4>
                     <div class="attribute-value">
                         <span>{{movement.primary}}</span>

templates/actors/npc-sheet.html

@@ -61,9 +61,10 @@
                     </footer>
                 </li>
 
-                <li class="attribute">
+                <li class="attribute movement">
                     <h4 class="attribute-name box-title">
-                        {{ localize "SW5E.Speed" }}
+                        {{ localize "SW5E.Movement" }}
+                        <a class="config-button" data-action="movement" title="{{localize 'SW5E.MovementConfig'}}"><i class="fas fa-cog"></i></a>
                     </h4>
                     <div class="attribute-value">
                         <span>{{movement.primary}}</span>

templates/actors/parts/active-effects.html

@@ -22,7 +22,7 @@
             <div class="effect-duration">{{effect.duration.label}}</div>
             <div class="item-controls effect-controls flexrow">
                 <a class="effect-control" data-action="toggle" title="{{localize 'SW5E.EffectToggle'}}">
-                    <i class="fas fa-circle-notch"></i>
+                    <i class="fas {{#if effect.data.disabled}}fa-check{{else}}fa-times{{/if}}"></i>
                 </a>
                 <a class="effect-control" data-action="edit" title="{{localize 'SW5E.EffectEdit'}}">
                     <i class="fas fa-edit"></i>

templates/actors/parts/actor-inventory.html

@@ -65,8 +65,12 @@
                 <h4>
                     {{item.name~}}
                     {{~#if item.isStack}} ({{item.data.quantity}}){{/if}}
-                    {{~#if item.data.attuned}} <i class="fas fa-sun attuned" title={{localize "SW5E.Attuned"}}></i>{{/if}}
                 </h4>
+                {{#if item.attunement}}
+                <div class="item-detail attunement">
+                    <i class="fas {{item.attunement.icon}} {{item.attunement.cls}}" title="{{localize item.attunement.title}}"></i>
+                </div>
+                {{/if}}
                 {{/if}}
             </div>
 

templates/actors/parts/actor-spellbook.html

@@ -15,6 +15,7 @@
             {{/each}}
             {{/select}}
         </select>
+        <span>{{localize "SW5E.AbbreviationDC"}} {{data.attributes.powerdc}}</span>
     </div>
 
     <ul class="filter-list flexrow" data-filter="powerbook">
@@ -30,28 +31,28 @@
 <ol class="items-list inventory-list">
 {{#each powerbook as |section|}}
     <li class="items-header powerbook-header flexrow">
-        <h3 class="item-name flexrow">{{section.label}}</h3>
-
-        <div class="power-slots">
-            {{#if section.usesSlots}}
-            <input type="text" name="data.powers.{{section.prop}}.value" value="{{section.uses}}" placeholder="0"
-                   data-dtype="Number"/>
-            <span class="sep"> / </span>
-            <span class="power-max" data-level="{{section.prop}}" data-slots="{{section.slots}}">
-                {{{section.slots}}}
-                {{#if ../editable}}
-                <a class="slot-max-override" title="{{localize 'SW5E.PowerProgOverride'}}">
-                    <i class="fas fa-edit"></i>
-                </a>
+        <div class="item-name flexrow">
+            <h3>{{section.label}}</h3>
+            <div class="power-slots">
+                {{#if section.usesSlots}}
+                <input type="text" name="data.powers.{{section.prop}}.value" value="{{section.uses}}" placeholder="0"
+                       data-dtype="Number"/>
+                <span class="sep"> / </span>
+                <span class="power-max" data-level="{{section.prop}}" data-slots="{{section.slots}}">
+                    {{{section.slots}}}
+                    {{#if ../editable}}
+                    <a class="slot-max-override" title="{{localize 'SW5E.PowerProgOverride'}}">
+                        <i class="fas fa-edit"></i>
+                    </a>
+                    {{/if}}
+                </span>
+                {{ else }}
+                <span>{{{section.uses}}}</span>
+                <span class="sep"> / </span>
+                <span class="power-max">{{{section.slots}}}</span>
                 {{/if}}
-            </span>
-            {{ else }}
-            <span>{{{section.uses}}}</span>
-            <span class="sep"> / </span>
-            <span class="power-max">{{{section.slots}}}</span>
-            {{/if}}
+            </div>
         </div>
-
         <div class="power-school">{{localize "SW5E.PowerSchool"}}</div>
         <div class="power-action">{{localize "SW5E.PowerUsage"}}</div>
         <div class="power-target">{{localize "SW5E.PowerTarget"}}</div>
@@ -74,12 +75,11 @@
                 {{#if item.data.uses.per }}
                 <div class="item-detail power-uses">Uses {{item.data.uses.value}} / {{item.data.uses.max}}</div>
                 {{/if}}
-            </div>
-
-            <div class="power-comps">
-                {{#each labels.components}}
-                <span class="power-component {{this}}">{{this}}</span>
-                {{/each}}
+                <div class="power-comps">
+                    {{#each labels.components}}
+                    <span class="power-component {{this}}">{{this}}</span>
+                    {{/each}}
+                </div>
             </div>
             <div class="power-school">{{labels.school}}</div>
             <div class="power-action">{{labels.activation}}</div>

templates/actors/parts/actor-traits.html

@@ -11,14 +11,14 @@
     </div>
 
     {{#unless isVehicle}}
-    <div class="form-group ">
-        <label>{{localize "SW5E.MovementConfig"}}</label>
-        <a class="configure-movement" title="{{localize 'SW5E.MovementConfig'}}"><i class="fas fa-cog"></i></a>
-    </div>
-
-    <div class="form-group {{#unless data.traits.senses}}inactive{{/unless}}">
+    <div class="form-group">
         <label>{{localize "SW5E.Senses"}}</label>
-        <input type="text" name="data.traits.senses" value="{{data.traits.senses}}" placeholder="{{ localize 'SW5E.None' }}"/>
+        <a class="config-button" data-action="senses" title="{{localize 'SW5E.MovementConfig'}}"><i class="fas fa-cog"></i></a>
+        <ul class="traits-list">
+        {{#each senses as |v k|}}
+            <li class="tag {{k}}">{{v}}</li>
+        {{/each}}
+        </ul>
     </div>
 
     <div class="form-group {{data.traits.languages.cssClass}}">
@@ -123,7 +123,7 @@
     {{#unless isVehicle}}
     <div class="form-group ">
         <label>{{localize "SW5E.SpecialTraits"}}</label>
-        <a class="configure-flags"><i class="fas fa-cog"></i></a>
+        <a class="config-button" data-action="flags" title="{{localize 'SW5E.SpecialTraits'}}"><i class="fas fa-cog"></i></a>
     </div>
     {{/unless}}
 </div>

templates/apps/ability-use.html

@@ -5,11 +5,11 @@
     <p class="notification error">{{localize this}}</p>
     {{/each}}
 
-    {{#if canUpcast}}
+    {{#if consumePowerSlot}}
     <div class="form-group">
         <label>{{ localize "SW5E.PowerCastUpcast" }}</label>
         <div class="form-fields">
-            <select name="level" {{#unless canUpcast}}disabled{{/unless}}>
+            <select name="level">
                 {{#select item.data.level}}
                 {{#each powerLevels as |l|}}
                 <option value="{{l.level}}" {{#unless l.canCast}}disabled{{/unless}}>{{l.label}}</option>
@@ -24,13 +24,25 @@
     </div>
     {{/if}}
 
-    {{#if hasLimitedUses}}
+    {{#if consumeUses}}
     <div class="form-group">
         <label class="checkbox"><input type="checkbox" name="consumeUse" checked/>{{ localize "SW5E.AbilityUseConsume" }}</label>
     </div>
     {{/if}}
 
-    {{#if hasPlaceableTemplate}}
+    {{#if consumeResource}}
+    <div class="form-group">
+        <label class="checkbox"><input type="checkbox" name="consumeResource" checked/>{{ localize "SW5E.ConsumeResource" }}</label>
+    </div>
+    {{/if}}
+
+    {{#if consumeRecharge}}
+    <div class="form-group">
+        <label class="checkbox"><input type="checkbox" name="consumeRecharge" checked/>{{ localize "SW5E.ConsumeRecharge" }}</label>
+    </div>
+    {{/if}}
+    
+    {{#if createTemplate}}
     <div class="form-group">
         <label class="checkbox">
             <input type="checkbox" name="placeTemplate" checked/>

templates/apps/senses-config.html

@@ -0,0 +1,20 @@
+<form autocomplete="off">
+    <p class="notes">{{localize "SW5E.SensesConfigHint"}}</p>
+    {{#each senses as |sense name|}}
+    <div class="form-group">
+        <label>{{sense.label}}</label>
+        <input name="data.attributes.senses.{{name}}" type="number" step="0.1" value="{{sense.value}}"/>
+    </div>
+    {{/each}}
+    <div class="form-group">
+        <label>{{localize "SW5E.MovementUnits"}}</label>
+        <select name="data.attributes.senses.units">
+            {{selectOptions movementUnits selected=units}}
+        </select>
+    </div>
+    <div class="form-group">
+        <label>{{localize "SW5E.SenseSpecial"}}</label>
+        <input type="text" name="data.attributes.senses.special" value="{{special}}"/>
+    </div>
+    <button type="submit" name="submit" value="1"><i class="far fa-save"></i> {{ localize "Submit"}}</button>
+</form>

templates/items/class.html

@@ -101,7 +101,7 @@
                 <label>
                     {{localize "SW5E.ClassSkillsChosen"}}
                     {{#if editable }}
-                    <a class="trait-selector class-skills" data-edit="data.skills" data-options="skills">
+                    <a class="trait-selector class-skills" data-target="data.skills" data-options="skills">
                         <i class="fas fa-edit"></i></a>
                     {{/if}}
                 </label>

templates/items/consumable.html

@@ -57,6 +57,13 @@
                 </select>
             </div>
 
+            <div class="form-group">
+                <label>{{localize "SW5E.Attunement"}}</label>
+                <select name="data.attunement" data-dtype="Number">
+                    {{selectOptions config.attunements selected=data.attunement localize=true}}
+                </select>
+            </div>
+
             <div class="form-group stacked">
                 <label>{{ localize "SW5E.ItemConsumableStatus" }}</label>
                 <label class="checkbox">
@@ -65,9 +72,6 @@
                 <label class="checkbox">
                     <input type="checkbox" name="data.identified" {{checked data.identified}}/> {{ localize "SW5E.Identified" }}
                 </label>
-                <label class="checkbox">
-                    <input type="checkbox" name="data.attuned" {{checked data.attuned}}/> {{ localize "SW5E.Attuned" }}
-                </label>
             </div>
 
             <h3 class="form-header">{{ localize "SW5E.ItemConsumableUsage" }}</h3>

templates/items/equipment.html

@@ -59,6 +59,13 @@
             </div>
 
             {{#unless isMountable}}
+            <div class="form-group">
+                <label>{{localize "SW5E.Attunement"}}</label>
+                <select name="data.attunement" data-dtype="Number">
+                    {{selectOptions config.attunements selected=data.attunement localize=true}}
+                </select>
+            </div>
+
             {{!-- Equipment Status --}}
             <div class="form-group stacked">
                 <label>{{ localize "SW5E.ItemEquipmentStatus" }}</label>
@@ -71,9 +78,6 @@
                 <label class="checkbox">
                     <input type="checkbox" name="data.identified" {{checked data.identified}}/> {{ localize "SW5E.Identified" }}
                 </label>
-                <label class="checkbox">
-                    <input type="checkbox" name="data.attuned" {{checked data.attuned}}/> {{ localize "SW5E.Attuned" }}
-                </label>
             </div>
             {{/unless}}
 

templates/items/parts/item-action.html

@@ -30,7 +30,7 @@
 <div class="form-group">
     <label>{{ localize "SW5E.ItemAttackBonus" }}</label>
     <div class="form-fields">
-        <input type="text" name="data.attackBonus" value="{{data.attackBonus}}" data-dtype="Number"/>
+        <input type="text" name="data.attackBonus" value="{{data.attackBonus}}"/>
     </div>
 </div>
 {{/if}}

templates/items/parts/item-activation.html

@@ -113,7 +113,7 @@
     <div class="form-fields">
         <input type="text" name="data.uses.value" value="{{data.uses.value}}" data-dtype="Number"/>
         <span class="sep">{{ localize "SW5E.of" }}</span>
-        <input type="text" name="data.uses.max" value="{{data.uses.max}}" data-dtype="Number"/>
+        <input type="text" name="data.uses.max" value="{{data.uses.max}}"/>
         <span class="sep">{{ localize "SW5E.per" }}</span>
         <select name="data.uses.per">
             {{#select data.uses.per}}

templates/items/weapon.html

@@ -58,6 +58,13 @@
             </div>
 
             {{#unless isMountable}}
+            <div class="form-group">
+                <label>{{localize "SW5E.Attunement"}}</label>
+                <select name="data.attunement" data-dtype="Number">
+                    {{selectOptions config.attunements selected=data.attunement localize=true}}
+                </select>
+            </div>
+
             {{!-- Weapon Status --}}
             <div class="form-group stacked">
                 <label>{{ localize "SW5E.ItemWeaponStatus" }}</label>
@@ -71,9 +78,6 @@
                     <label class="checkbox">
                         <input type="checkbox" name="data.identified" {{checked data.identified}}/> {{ localize "SW5E.Identified" }}
                     </label>
-                    <label class="checkbox">
-                        <input type="checkbox" name="data.attuned" {{checked data.attuned}}/> {{ localize "SW5E.Attuned" }}
-                    </label>
                 </div>
             </div>
             {{/unless}}