System 1.1.1 ** Requires Foundry 0.7.6

System main update to be inline with dnd5e 1.1.1

Added active effects to as many sheets as I thought applicable. Please check loot, I made an attempt but it may be broken

All .less .css and actor .html updates were made to the old actors.  New actors may be broken with this update

removed templates\actors\oldActor\parts\actor-effects.html for newer templates\actors\parts\active-effects.html

removed module\apps\cast-dialog, templates\apps\cast-cast.html, and templates\items\cast.html.  I do not think they are used, I think they were deprecated when powers were treated as items, if not we can add them back in.

**NOTE** REQUIRES Foundry 0.7.6

templates/actors/oldActor/character-sheet.html

@@ -82,25 +82,25 @@
                 </li>
 
                 <li class="attribute">
-                    <h4 class="attribute-name box-title">{{ localize "SW5E.Speed" }}</h4>
+                    <h4 class="attribute-name box-title">
+                        {{ localize "SW5E.Speed" }}
+                    </h4>
                     <div class="attribute-value">
-                        <input name="data.attributes.speed.value" type="text"
-                               value="{{data.attributes.speed.value}}" placeholder="0"/>
+                        <span>{{movement.primary}}</span>
                     </div>
                     <footer class="attribute-footer">
-                        <input type="text" class="speed" name="data.attributes.speed.special"
-                               value="{{data.attributes.speed.special}}" placeholder="{{ localize 'SW5E.SpeedSpecial' }}"/>
+                        <span>{{movement.special}}</span>
                     </footer>
                 </li>
 
                 <li class="attribute initiative">
-                    <h4 class="attribute-name box-title">{{ localize "SW5E.Initiative" }}</h4>
+                    <h4 class="attribute-name box-title rollable" data-action="rollInitiative">{{ localize "SW5E.Initiative" }}</h4>
                     <div class="attribute-value">
                         <span>{{numberFormat data.attributes.init.total decimals=0 sign=true}}</span>
                     </div>
                     <footer class="attribute-footer">
                         <span>{{ localize "SW5E.Modifier" }}</span>
-                        <input name="data.attributes.init.value" type="number" placeholder="0"
+                        <input name="data.attributes.init.value" type="text" data-dtype="Number" placeholder="0"
                                value="{{numberFormat data.attributes.init.value decimals=0 sign=true}}"/>
                     </footer>
                 </li>
@@ -108,17 +108,17 @@
         </section>
     </header>
 
-    {{!-- NPC Sheet Navigation --}}
+    {{!-- Character Sheet Navigation --}}
     <nav class="sheet-navigation tabs" data-group="primary">
         <a class="item active" data-tab="attributes">{{ localize "SW5E.Attributes" }}</a>
         <a class="item" data-tab="inventory">{{ localize "SW5E.Inventory" }}</a>
         <a class="item" data-tab="features">{{ localize "SW5E.Features" }}</a>
         <a class="item" data-tab="powerbook">{{ localize "SW5E.Powerbook" }}</a>
-		<a class="item" data-tab="effects">{{ localize "SW5E.Effects" }}</a>
+        <a class="item" data-tab="effects">{{ localize "SW5E.Effects" }}</a>
         <a class="item" data-tab="biography">{{ localize "SW5E.Biography" }}</a>
     </nav>
 
-    {{!-- NPC Sheet Body --}}
+    {{!-- Character Sheet Body --}}
     <section class="sheet-body">
 
         <div class="tab attributes flexrow" data-group="primary" data-tab="attributes">
@@ -183,7 +183,7 @@
                 {{!-- Counters --}}
                 <div class="counters">
                     <div class="counter flexrow death-saves">
-                        <h4 class="death-save rollable">{{ localize "SW5E.DeathSave" }}</h4>
+                        <h4 class="rollable" data-action="rollDeathSave">{{ localize "SW5E.DeathSave" }}</h4>
                         <div class="counter-value">
                             <i class="fas fa-check"></i>
                             <input name="data.attributes.death.success" type="number" placeholder="0"
@@ -228,12 +228,12 @@
         <div class="tab powerbook flexcol" data-group="primary" data-tab="powerbook">
             {{> "systems/sw5e/templates/actors/oldActor/parts/actor-powerbook.html"}}
         </div>
-		
+
         {{!-- Effects Tab --}}
         <div class="tab effects flexcol" data-group="primary" data-tab="effects">
-            {{> "systems/sw5e/templates/actors/oldActor/parts/actor-effects.html"}}
+            {{> "systems/sw5e/templates/actors/parts/active-effects.html"}}
         </div>
-		
+
         {{!-- Biography Tab --}}
         <div class="tab flexrow" data-group="primary" data-tab="biography">
             <div class="characteristics flexcol">

templates/actors/oldActor/npc-sheet.html

@@ -62,14 +62,14 @@
                 </li>
 
                 <li class="attribute">
-                    <h4 class="attribute-name box-title">{{ localize "SW5E.Speed" }}</h4>
+                    <h4 class="attribute-name box-title">
+                        {{ localize "SW5E.Speed" }}
+                    </h4>
                     <div class="attribute-value">
-                        <input name="data.attributes.speed.value" type="text"
-                               value="{{data.attributes.speed.value}}" placeholder="0"/>
+                        <span>{{movement.primary}}</span>
                     </div>
                     <footer class="attribute-footer">
-                        <input type="text" class="speed" name="data.attributes.speed.special"
-                               value="{{data.attributes.speed.special}}" placeholder="{{ localize 'SW5E.SpeedSpecial' }}"/>
+                        <span>{{movement.special}}</span>
                     </footer>
                 </li>
             </ul>
@@ -81,6 +81,7 @@
         <a class="item active" data-tab="attributes">{{ localize "SW5E.Attributes" }}</a>
         <a class="item" data-tab="features">{{ localize "SW5E.Features" }}</a>
         <a class="item" data-tab="powerbook">{{ localize "SW5E.Powerbook" }}</a>
+        <a class="item" data-tab="effects">{{ localize "SW5E.Effects" }}</a>
         <a class="item" data-tab="biography">{{ localize "SW5E.Biography" }}</a>
     </nav>
 
@@ -143,24 +144,29 @@
                         <div class="counter-value">
                             <input name="data.resources.lair.value" type="checkbox" value="{{data.resources.lair.value}}"
                                    data-dtype="Boolean" {{checked data.resources.lair.value}}/>
-                                   <input name="data.resources.lair.initiative" type="number" value="{{data.resources.lair.initiative}}" placeholder="20"/>
-                                </div>
+                            <input name="data.resources.lair.initiative" type="number" value="{{data.resources.lair.initiative}}" placeholder="20"/>
+                        </div>
                     </div>
                 </div>
 
                 {{!-- Traits --}}
-                {{> "systems/sw5e/templates/actors/parts/actor-traits.html"}}
+                {{> "systems/sw5e/templates/actors/oldActor/parts/actor-traits.html"}}
             </section>
         </div>
 
         {{!-- Features Tab --}}
         <div class="tab features flexcol" data-group="primary" data-tab="features">
-            {{> "systems/sw5e/templates/actors/parts/actor-features.html" sections=features}}
+            {{> "systems/sw5e/templates/actors/oldActor/parts/actor-features.html" sections=features}}
         </div>
 
         {{!-- Powerbook Tab --}}
         <div class="tab powerbook flexcol" data-group="primary" data-tab="powerbook">
-            {{> "systems/sw5e/templates/actors/parts/actor-powerbook.html"}}
+            {{> "systems/sw5e/templates/actors/oldActor/parts/actor-powerbook.html"}}
+        </div>
+
+        {{!-- Effects Tab --}}
+        <div class="tab effects flexcol" data-group="primary" data-tab="effects">
+            {{> "systems/sw5e/templates/actors/parts/active-effects.html"}}
         </div>
 
         {{!-- Biography Tab --}}
@@ -168,4 +174,4 @@
             {{editor content=data.details.biography.value target="data.details.biography.value" button=true owner=owner editable=editable}}
         </div>
     </section>
-</form>
+</form>

templates/actors/oldActor/parts/actor-effects.html

@@ -1,28 +0,0 @@
-<ol class="inventory-list">
-{{#each effects as |section sid|}}
-    <li class="inventory-header flexrow">
-        <h3 class="effect-name flexrow">{{localize section.label}}</h3>
-        <div class="effect-source">Source</div>
-        <div class="effect-source">Duration</div>
-        <div class="effect-controls"></div>
-    </li>
-
-    <ol class="effects-list item-list">
-    {{#each section.effects as |effect|}}
-        <li class="effect flexrow" data-effect-id="{{effect.id}}">
-            <div class="effect-name flexrow">
-                <img class="effect-icon" src="{{effect.data.icon}}"/>
-                <h4>{{effect.data.label}}</h4>
-            </div>
-            <div class="effect-source">{{effect.sourceName}}</div>
-            <div class="effect-duration">{{effect.duration.label}}</div>
-            <div class="effect-controls">
-                <a class="effect-control" data-action="toggle"><i class="fas fa-circle-notch"></i></a>
-                <a class="effect-control" data-action="edit"><i class="fas fa-edit"></i></a>
-                <a class="effect-control" data-action="delete"><i class="fas fa-trash"></i></a>
-            </div>
-        </li>
-    {{/each}}
-    </ol>
-{{/each}}
-</ol>

templates/actors/oldActor/parts/actor-features.html

@@ -8,9 +8,9 @@
 </div>
 {{/unless}}
 
-<ol class="inventory-list">
+<ol class="items-list inventory-list">
 {{#each sections as |section sid|}}
-    <li class="inventory-header flexrow">
+    <li class="items-header flexrow">
         <h3 class="item-name flexrow">{{localize section.label}}</h3>
 
         {{#if section.hasActions}}
@@ -25,7 +25,7 @@
         {{/if}}
 
         {{#if ../owner}}
-        <div class="item-controls">
+        <div class="item-controls flexrow">
             <a class="item-control item-create" title="{{localize 'SW5E.FeatureAdd'}}" {{#each section.dataset as |v k|}}data-{{k}}="{{v}}"{{/each}}>
                 <i class="fas fa-plus"></i> {{localize "SW5E.Add"}}
             </a>
@@ -78,7 +78,7 @@
 			<div class="item-detail player-classfeatures">
 			    {{item.data.name}}
 			</div>
-
+            
 			{{else if section.isFightingstyles}}
 			<div class="item-detail player-fightingstyles">
 			    {{item.data.name}}
@@ -119,7 +119,7 @@
             {{/if}}
 
             {{#if ../../owner}}
-            <div class="item-controls">
+            <div class="item-controls flexrow">
                 {{#if section.crewable}}
                 <a class="item-control item-toggle {{item.toggleClass}}"
                    title="{{item.toggleTitle}}">

templates/actors/oldActor/parts/actor-inventory.html

@@ -4,7 +4,6 @@
     <ol class="currency flexrow">
         <h3>
             {{localize "SW5E.Currency"}}
-            <a class="currency-convert" title="Convert Currency"><i class="fas fa-coins"></i></a>
         </h3>
         {{#each data.currency as |v k|}}
         <label class="denomination {{k}}">{{ lookup ../config.currencies k }}</label>
@@ -23,9 +22,9 @@
     {{/unless}}
 </div>
 
-<ol class="inventory-list">
+<ol class="items-list inventory-list">
 {{#each sections as |section sid|}}
-    <li class="inventory-header flexrow">
+    <li class="items-header flexrow">
         <h3 class="item-name flexrow">{{localize section.label}}</h3>
 
         {{#if section.columns}}
@@ -33,18 +32,18 @@
                 <div class="item-detail {{css}}">{{label}}</div>
             {{/each}}
         {{else}}
-        {{#if ../isCharacter}}
-        <div class="item-detail item-weight">{{localize "SW5E.Weight"}}</div>
-        {{/if}}
+            {{#if ../isCharacter}}
+                <div class="item-detail item-weight">{{localize "SW5E.Weight"}}</div>
+            {{/if}}
 
-        <div class="item-detail item-uses">{{localize "SW5E.Charges"}}</div>
-        <div class="item-detail item-action">{{localize "SW5E.Usage"}}</div>
+            <div class="item-detail item-uses">{{localize "SW5E.Charges"}}</div>
+            <div class="item-detail item-action">{{localize "SW5E.Usage"}}</div>
         {{/if}}
 
         {{#if ../owner}}
-        <div class="item-controls">
+        <div class="item-controls flexrow">
             <a class="item-control item-create" title='{{localize "SW5E.ItemCreate"}}'
-                {{#each section.dataset as |v k|}}data-{{k}}="{{v}}"{{/each}}>
+               {{#each section.dataset as |v k|}}data-{{k}}="{{v}}"{{/each}}>
                 <i class="fas fa-plus"></i> {{localize "SW5E.Add"}}
             </a>
         </div>
@@ -53,13 +52,13 @@
 
     <ol class="item-list">
     {{#each section.items as |item iid|}}
-    <li class="item flexrow {{section.css}}"
-    data-item-id="{{#if section.editableName}}{{iid}}{{else}}{{item._id}}{{/if}}">
-    <div class="item-name flexrow rollable">
-        {{#if section.editableName}}
-        <input type="text" value="{{item.name}}">
-        {{else}}
-        <div class="item-image" style="background-image: url('{{item.img}}')"></div>
+        <li class="item flexrow {{section.css}}"
+            data-item-id="{{#if section.editableName}}{{iid}}{{else}}{{item._id}}{{/if}}">
+            <div class="item-name flexrow rollable">
+                {{#if section.editableName}}
+                <input type="text" value="{{item.name}}">
+                {{else}}
+                <div class="item-image" style="background-image: url('{{item.img}}')"></div>
                 <h4>
                     {{item.name~}}
                     {{~#if item.isStack}} ({{item.data.quantity}}){{/if}}
@@ -82,32 +81,32 @@
                     </div>
                 {{/each}}
             {{else}}
-            {{#if ../../isCharacter}}
-            <div class="item-detail item-weight">
-                {{#if item.totalWeight}}
-                <div class="item-detail">
-                    {{ item.totalWeight }} {{localize "SW5E.AbbreviationLbs"}}
+                {{#if ../../isCharacter}}
+                    <div class="item-detail item-weight">
+                        {{#if item.totalWeight}}
+                            <div class="item-detail">
+                                {{ item.totalWeight }} {{localize "SW5E.AbbreviationLbs"}}
+                            </div>
+                        {{/if}}
+                    </div>
+                {{/if}}
+
+                <div class="item-detail item-uses">
+                    {{#if item.hasUses }}
+                        <input type="text" value="{{item.data.uses.value}}" placeholder="0"/>
+                        / {{item.data.uses.max}}
+                    {{/if}}
                 </div>
-                {{/if}}
-            </div>
-            {{/if}}
 
-            <div class="item-detail item-uses">
-                {{#if item.hasUses }}
-                    <input type="text" value="{{item.data.uses.value}}" placeholder="0"/>
-                    / {{item.data.uses.max}}
-                {{/if}}
-            </div>
-
-            <div class="item-detail item-action">
-                {{#if item.data.activation.type }}
-                {{item.labels.activation}}
-                {{/if}}
-            </div>
+                <div class="item-detail item-action">
+                    {{#if item.data.activation.type }}
+                        {{item.labels.activation}}
+                    {{/if}}
+                </div>
             {{/if}}
 
             {{#if ../../owner}}
-            <div class="item-controls">
+            <div class="item-controls flexrow">
                 {{#unless @root.isVehicle}}
                 <a class="item-control item-toggle {{item.toggleClass}}" title='{{item.toggleTitle}}'><i class="fas fa-shield-alt"></i></a>
                 {{/unless}}

templates/actors/oldActor/parts/actor-powerbook.html

@@ -27,12 +27,10 @@
     </ul>
 </div>
 
-<ol class="inventory-list">
+<ol class="items-list inventory-list">
 {{#each powerbook as |section|}}
-    <li class="item flexrow inventory-header powerbook-header">
-        <div class="item-name flexrow">
-            <h3>{{section.label}}</h3>
-        </div>
+    <li class="items-header powerbook-header flexrow">
+        <h3 class="item-name flexrow">{{section.label}}</h3>
 
         <div class="power-slots">
             {{#if section.usesSlots}}
@@ -46,6 +44,7 @@
                     <i class="fas fa-edit"></i>
                 </a>
                 {{/if}}
+            </span>
             {{ else }}
             <span>{{{section.uses}}}</span>
             <span class="sep"> / </span>
@@ -57,7 +56,7 @@
         <div class="power-action">{{localize "SW5E.PowerUsage"}}</div>
         <div class="power-target">{{localize "SW5E.PowerTarget"}}</div>
 
-        <div class="item-controls">
+        <div class="item-controls flexrow">
             {{#if section.canCreate}}
             <a class="item-control item-create" title="{{localize 'SW5E.PowerCreate'}}" {{#each section.dataset as |v k|}}data-{{k}}="{{v}}"{{/each}}>
                 <i class="fas fa-plus"></i> {{localize "SW5E.Add"}}
@@ -91,9 +90,8 @@
                 {{/if}}
             </div>
 
-
             {{#if ../../owner}}
-            <div class="item-controls">
+            <div class="item-controls flexrow">
                 {{#if section.canPrepare}}
                 <a class="item-control item-toggle {{item.toggleClass}}" title="{{item.toggleTitle}}"><i class="fas fa-sun"></i></a>
                 {{/if}}
@@ -110,7 +108,7 @@
     <li class="item flexrow"><p class="notes">{{localize "SW5E.FilterNoPowers"}}</p></li>
     {{else}}
     <li class="item flexrow inventory-header powerbook-header powerbook-empty">
-        <div class="item-controls">
+        <div class="item-controls flexrow">
             <a class="item-control item-create" title="{{localize 'SW5E.PowerCreate'}}" data-type="power"
                data-level="{{lvl}}"><i class="fas fa-plus"></i> {{localize "SW5E.PowerAdd"}}</a>
         </div>

templates/actors/oldActor/parts/actor-traits.html

@@ -11,6 +11,11 @@
     </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}}">
         <label>{{localize "SW5E.Senses"}}</label>
         <input type="text" name="data.traits.senses" value="{{data.traits.senses}}" placeholder="{{ localize 'SW5E.None' }}"/>

templates/actors/oldActor/vehicle-sheet.html

@@ -58,8 +58,7 @@
                 <li class="attribute">
                     <h4 class="attribute-name box-title">{{localize 'SW5E.Speed'}}</h4>
                     <div class="attribute-value">
-                        <input name="data.attributes.speed.value" type="text" placeholder="&mdash;"
-                               value="{{data.attributes.speed.value}}">
+                        <input name="data.attributes.speed" type="text" placeholder="&mdash;" value="{{data.attributes.speed}}"/>
                     </div>
                 </li>
             </ul>
@@ -139,16 +138,16 @@
                         </div>
                     </div>
                 </div>
-                {{> 'systems/sw5e/templates/actors/parts/actor-traits.html'}}
+                {{> 'systems/sw5e/templates/actors/oldActor/parts/actor-traits.html'}}
             </section>
         </div>
 
         <div class="tab features flexcol" data-group="primary" data-tab="features">
-            {{> 'systems/sw5e/templates/actors/parts/actor-features.html' sections=features}}
+            {{> 'systems/sw5e/templates/actors/oldActor/parts/actor-features.html' sections=features}}
         </div>
 
         <div class="tab cargo flexcol" data-group="primary" data-tab="cargo">
-            {{> 'systems/sw5e/templates/actors/parts/actor-inventory.html' sections=cargo}}
+            {{> 'systems/sw5e/templates/actors/oldActor/parts/actor-inventory.html' sections=cargo}}
         </div>
 
         <div class="tab biography flexcol" data-group="primary" data-tab="biography">

templates/actors/parts/active-effects.html

@@ -0,0 +1,38 @@
+<ol class="items-list effects-list">
+{{#each effects as |section sid|}}
+    <li class="items-header flexrow" data-effect-type="{{section.type}}">
+        <h3 class="item-name effect-name flexrow">{{localize section.label}}</h3>
+        <div class="effect-source">Source</div>
+        <div class="effect-source">Duration</div>
+        <div class="item-controls effect-controls flexrow">
+            <a class="effect-control" data-action="create" title="{{localize 'SW5E.EffectCreate'}}">
+                <i class="fas fa-plus"></i> {{localize "SW5E.Add"}}
+            </a>
+        </div>
+    </li>
+
+    <ol class="item-list">
+    {{#each section.effects as |effect|}}
+        <li class="item effect flexrow" data-effect-id="{{effect.id}}">
+            <div class="item-name effect-name flexrow">
+                <img class="item-image" src="{{effect.data.icon}}"/>
+                <h4>{{effect.data.label}}</h4>
+            </div>
+            <div class="effect-source">{{effect.sourceName}}</div>
+            <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>
+                </a>
+                <a class="effect-control" data-action="edit" title="{{localize 'SW5E.EffectEdit'}}">
+                    <i class="fas fa-edit"></i>
+                </a>
+                <a class="effect-control" data-action="delete" title="{{localize 'SW5E.EffectDelete'}}">
+                    <i class="fas fa-trash"></i>
+                </a>
+            </div>
+        </li>
+    {{/each}}
+    </ol>
+{{/each}}
+</ol>

templates/apps/actor-flags.html

@@ -1,44 +1,48 @@
 <form class="{{cssClass}}" autocomplete="off">
-	<p class="notes">{{localize 'SW5E.FlagsInstructions'}}</p>
+    <section class="form-body">
+	    <p class="notes">{{localize 'SW5E.FlagsInstructions'}}</p>
 
-    {{#each flags as |fs section|}}
-    <h3 class="form-header">{{localize section}}</h3>
-    {{#each fs as |flag key|}}
+        {{#each flags as |fs section|}}
+        <h3 class="form-header">{{localize section}}</h3>
+        {{#each fs as |flag key|}}
 
-    <div class="form-group">
-        <label>{{localize flag.name}}</label>
+        <div class="form-group">
+            <label>{{localize flag.name}}</label>
 
-        {{#if flag.isCheckbox}}
-        <input type="checkbox" name="{{key}}" data-dtype="Boolean" {{checked flag.value}}/>
+            {{#if flag.isCheckbox}}
+            <input type="checkbox" name="{{key}}" data-dtype="Boolean" {{checked flag.value}}/>
 
-        {{else if flag.isSelect}}
-        <select name="{{key}}" data-dtype="{{flag.type}}">
-            {{#select flag.value}}
-            {{#each flag.choices as |v k|}}
-            <option value="{{k}}">{{localize v}}</option>
-            {{/each}}
-            {{/select}}
-        </select>
+            {{else if flag.isSelect}}
+            <select name="{{key}}" data-dtype="{{flag.type}}">
+                {{#select flag.value}}
+                {{#each flag.choices as |v k|}}
+                <option value="{{k}}">{{localize v}}</option>
+                {{/each}}
+                {{/select}}
+            </select>
 
-        {{else}}
-        <input type="text" name="{{key}}" value="{{flag.value}}" placeholder="{{flag.placeholder}}" data-dtype="{{flag.type}}"/>
-        {{/if}}
+            {{else}}
+            <input type="text" name="{{key}}" value="{{flag.value}}" placeholder="{{flag.placeholder}}" data-dtype="{{flag.type}}"/>
+            {{/if}}
 
-        <p class="notes">{{localize flag.hint}}</p>
-    </div>
-    {{/each}}
-    {{/each}}
+            <p class="notes">{{localize flag.hint}}</p>
+        </div>
+        {{/each}}
+        {{/each}}
 
-    <h3 class="form-header">{{localize "SW5E.Bonuses"}}</h3>
-    <p class="notes">{{localize "SW5E.BonusesHint"}}</p>
-    {{#each bonuses as |b|}}
-    <div class="form-group">
-        <label>{{localize b.label}}</label>
-        <input type="text" name="{{b.name}}" value="{{b.value}}"/>
-    </div>
-    {{/each}}
+        <h3 class="form-header">{{localize "SW5E.Bonuses"}}</h3>
+        <p class="notes">{{localize "SW5E.BonusesHint"}}</p>
+        {{#each bonuses as |b|}}
+        <div class="form-group">
+            <label>{{localize b.label}}</label>
+            <input type="text" name="{{b.name}}" value="{{b.value}}"/>
+        </div>
+        {{/each}}
+    </section>
 
-    <button type="submit" name="submit">
-        <i class="far fa-save"></i> {{localize 'SW5E.FlagsSave'}}
-    </button>
+    <footer class="form-footer">
+        <button type="submit" name="submit">
+            <i class="far fa-save"></i> {{localize 'SW5E.FlagsSave'}}
+        </button>
+    </footer>
 </form>

templates/apps/cast-cast.html

@@ -1,34 +0,0 @@
-<form id="cast-config-form">
-    <p>{{ localize "SW5E.SpellCastHint" }} <strong>{{item.name}}</strong> {{ localize "SW5E.cast" }}.</p>
-
-    {{#unless canCast}}
-    <p class="notification error">{{ localize "SW5E.SpellCastNoSlots" }}</p>
-    {{/unless}}
-
-    <div class="form-group">
-        <label>{{ localize "SW5E.SpellCastUpcast" }}</label>
-        <div class="form-fields">
-            <select name="level">
-                {{#select item.data.level}}
-                {{#each castLevels 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 "SW5E.SpellCastConsume" }} <input type="checkbox" name="consume" {{checked canCast}}/></label>
-        {{/if}}
-
-        {{#if hasPlaceableTemplate}}
-        <div class="form-group">
-            <label class="checkbox">{{ localize "SW5E.PlaceTemplate" }}
-                <input type="checkbox" name="placeTemplate" checked/>
-            </label>
-        </div>
-        {{/if}}
-    </div>
-</form>

templates/apps/movement-config.html

@@ -0,0 +1,34 @@
+<form autocomplete="off">
+    <p class="notes">{{localize "SW5E.MovementConfigHint"}}</p>
+    <div class="form-group">
+        <label>{{localize "SW5E.MovementWalk"}}</label>
+        <input name="data.attributes.movement.walk" type="number" step="0.1" value="{{movement.walk}}"/>
+    </div>
+    <div class="form-group">
+        <label>{{localize "SW5E.MovementBurrow"}}</label>
+        <input name="data.attributes.movement.burrow" type="number" step="0.1" value="{{movement.burrow}}"/>
+    </div>
+    <div class="form-group">
+        <label>{{localize "SW5E.MovementClimb"}}</label>
+        <input name="data.attributes.movement.climb" type="number" step="0.1" value="{{movement.climb}}"/>
+    </div>
+    <div class="form-group">
+        <label>{{localize "SW5E.MovementFly"}}</label>
+        <input name="data.attributes.movement.fly" type="number" step="0.1" value="{{movement.fly}}"/>
+    </div>
+    <div class="form-group">
+        <label>{{localize "SW5E.MovementSwim"}}</label>
+        <input name="data.attributes.movement.swim" type="number" step="0.1" value="{{movement.swim}}"/>
+    </div>
+    <div class="form-group">
+        <label>{{localize "SW5E.MovementUnits"}}</label>
+        <select name="data.attributes.movement.units">
+            {{selectOptions units selected=movement.units}}
+        </select>
+    </div>
+    <div class="form-group">
+        <label>{{localize "SW5E.MovementHover"}}</label>
+        <input name="data.attributes.movement.hover" type="checkbox" {{checked movement.hover}}/>
+    </div>
+    <button type="submit" name="submit" value="1"><i class="far fa-save"></i> {{ localize "Submit"}}</button>
+</form>

templates/apps/trait-selector.html

@@ -15,5 +15,5 @@
         <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>
+    <button type="submit" name="submit" value="1"><i class="far fa-save"></i> {{ localize "SW5E.TraitSave"}}</button>
 </form>

templates/chat/tool-card.html

@@ -1,7 +1,7 @@
 <div class="sw5e chat-card item-card" data-actor-id="{{actor._id}}" data-item-id="{{item._id}}" {{#if tokenId}}data-token-id="{{tokenId}}"{{/if}}>
     <header class="card-header flexrow">
         <img src="{{item.img}}" title="{{item.name}}" width="36" height="36"/>
-        <h3>{{item.name}}</h3>
+        <h3 class="item-name">{{item.name}}</h3>
     </header>
 
     <div class="card-content">{{{data.description.value}}}</div>

templates/items/archetype.html

@@ -31,6 +31,7 @@
     {{!-- Item Sheet Navigation --}}
     <nav class="sheet-navigation tabs" data-group="primary">
         <a class="item active" data-tab="description">{{ localize "SW5E.Description" }}</a>
+        <a class="item" data-tab="effects">{{ localize "SW5E.Effects" }}</a>
         <!-- <a class="item" data-tab="details">{{ localize "SW5E.Details" }}</a> -->
     </nav>
 
@@ -39,7 +40,13 @@
 
         {{!-- Description Tab --}}
 		<div class="tab description" data-group="primary" data-tab="description">
-        {{editor content=data.description.value target="data.description.value" button=true owner=owner editable=editable}}		
-		</div>
+            {{editor content=data.description.value target="data.description.value" button=true owner=owner editable=editable}}
+        </div>
+        
+        {{!-- Effects Tab --}}
+        <div class="tab effects flexcol" data-group="primary" data-tab="effects">
+            {{> "systems/sw5e/templates/actors/parts/active-effects.html"}}
+        </div>
+
     </section>
 </form>

templates/items/background.html

@@ -24,6 +24,7 @@
     {{!-- Item Sheet Navigation --}}
     <nav class="sheet-navigation tabs" data-group="primary">
         <a class="item active" data-tab="description">{{ localize "SW5E.Description" }}</a>
+        <a class="item" data-tab="effects">{{ localize "SW5E.Effects" }}</a>
         <!-- <a class="item" data-tab="details">{{ localize "SW5E.Details" }}</a> -->
     </nav>
 
@@ -32,68 +33,42 @@
 
         {{!-- Description Tab --}}
         <div class="tab description" data-group="primary" data-tab="description">
-<div class="background">{{editor content=data.flavorText.value target="data.flavorText.value" button=true editable=editable}}</div>
-<div class="background"><p><strong>Skill Proficiencies:</strong> {{{data.skillProficiencies.value}}}</p></div>
-<div class="background"><p><strong>Tool Proficiencies:</strong> {{{data.toolProficiencies.value}}}</p></div>
-<div class="background"><p><strong>Languages:</strong> {{{data.languages.value}}}</p></div>
-<div class="background"><p><strong>Equipment:</strong> {{{data.equipment.value}}}</p></div>
-<div class="background"><h3>{{{data.flavorName.value}}}</h3></div>
-<div class="background"><p>{{{data.flavorDescription.value}}}</p></div>
-<div class="smalltable"><p>{{{data.flavorOptions.value}}}</p></div>
-<div class="background"><h2>Feature: {{{data.featureName.value}}}</h2></div>
-<div class="background"><p>{{{data.featureText.value}}}</p></div>
-<h2>Background Feat</h2>
-<p>As a further embodiment of the experience and training of your background, you can choose from the following feats:</p>
-<div class="smalltable"><p>{{{data.featOptions.value}}}</p></div>
-<h3>Suggested Characteristics</h3>
-<div class="background"><p>{{{data.suggestedCharacteristics.value}}}</p></div>
-<div class="medtable"><p>{{{data.personalityTraitOptions.value}}}</p></div><p>&nbsp;</p>
-<div class="medtable"><p>{{{data.idealOptions.value}}}</p></div><p>&nbsp;</p>
-<div class="medtable"><p>{{{data.flawOptions.value}}}</p></div><p>&nbsp;</p>
-<div class="medtable"><p>{{{data.bondOptions.value}}}</p></div>
+            <div class="background">{{editor content=data.flavorText.value target="data.flavorText.value" button=true editable=editable}}</div>
+            <div class="background"><p><strong>Skill Proficiencies:</strong> {{{data.skillProficiencies.value}}}</p></div>
+            <div class="background"><p><strong>Tool Proficiencies:</strong> {{{data.toolProficiencies.value}}}</p></div>
+            <div class="background"><p><strong>Languages:</strong> {{{data.languages.value}}}</p></div>
+            <div class="background"><p><strong>Equipment:</strong> {{{data.equipment.value}}}</p></div>
+            <div class="background"><h3>{{{data.flavorName.value}}}</h3></div>
+            <div class="background"><p>{{{data.flavorDescription.value}}}</p></div>
+            <div class="smalltable"><p>{{{data.flavorOptions.value}}}</p></div>
+            <div class="background"><h2>Feature: {{{data.featureName.value}}}</h2></div>
+            <div class="background"><p>{{{data.featureText.value}}}</p></div>
+            <h2>Background Feat</h2>
+            <p>As a further embodiment of the experience and training of your background, you can choose from the following feats:</p>
+            <div class="smalltable"><p>{{{data.featOptions.value}}}</p></div>
+            <h3>Suggested Characteristics</h3>
+            <div class="background"><p>{{{data.suggestedCharacteristics.value}}}</p></div>
+            <div class="medtable"><p>{{{data.personalityTraitOptions.value}}}</p></div><p>&nbsp;</p>
+            <div class="medtable"><p>{{{data.idealOptions.value}}}</p></div><p>&nbsp;</p>
+            <div class="medtable"><p>{{{data.flawOptions.value}}}</p></div><p>&nbsp;</p>
+            <div class="medtable"><p>{{{data.bondOptions.value}}}</p></div>
 
-<script>
-let nullField = document.querySelectorAll('.background > div');
+            <script>
+                let nullField = document.querySelectorAll('.background > div');
 
-nullField.forEach(function(element) {
-
-  if (element.value === null) {
-    element.previousElementSibling.style.display = 'none';
-    element.style.display = 'none';
-  }
-});
-</script>        
-        </div>    
- <!--    {{> "systems/sw5e/templates/items/parts/item-description.html"}}
-
-        {{!-- Details Tab --}}
-        <div class="tab details" data-group="primary" data-tab="details">
-
-            <h3 class="form-header">{{ localize "SW5E.FeatureUsage" }}</h3>
-
-            {{!-- Item Activation Template --}}
-            {{> "systems/sw5e/templates/items/parts/item-activation.html"}}
-
-            {{!-- Recharge Requirement --}}
-            {{#if data.activation.type}}
-            <div class="form-group recharge">
-                <label>{{ localize "SW5E.FeatureActionRecharge" }}</label>
-                <div class="form-fields">
-                    <span>{{ localize "SW5E.FeatureRechargeOn" }}</span>
-                    <input type="text" name="data.recharge.value" value="{{data.recharge.value}}"
-                           data-dtype="Number" placeholder="{{ localize 'SW5E.FeatureRechargeResult' }}"/>
-                    <label class="checkbox">
-                        {{ localize "SW5E.Charged" }}
-                        <input type="checkbox" name="data.recharge.charged" {{checked data.recharge.charged}}/>
-                    </label>
-                </div>
-            </div>
-            {{/if}}
-
-            <h3 class="form-header">{{ localize "SW5E.FeatureAttack" }}</h3>
-
-            {{!-- Item Action Template --}}
-            {{> "systems/sw5e/templates/items/parts/item-action.html"}}
-        </div> -->
+                nullField.forEach(function(element) {
+                    if (element.value === null) {
+                        element.previousElementSibling.style.display = 'none';
+                        element.style.display = 'none';
+                    }
+                });
+            </script>        
+        </div> 
+        
+        {{!-- Effects Tab --}}
+        <div class="tab effects flexcol" data-group="primary" data-tab="effects">
+            {{> "systems/sw5e/templates/actors/parts/active-effects.html"}}
+        </div>
+   
     </section>
 </form>

templates/items/cast.html

@@ -1,151 +0,0 @@
-<form class="{{cssClass}} flexcol" autocomplete="off">
-
-    {{!-- Item Sheet Header --}}
-    <header class="sheet-header flexrow">
-        <img class="profile" src="{{item.img}}" title="{{item.name}}" data-edit="img"/>
-
-        <div class="header-details flexrow">
-            <h1 class="charname">
-                <input name="name" type="text" value="{{item.name}}" placeholder="{{ localize 'SW5E.CastName' }}"/>
-            </h1>
-
-            <div class="item-subtitle">
-                <h4 class="item-type">{{itemType}}</h4>
-                <span class="item-status">{{itemStatus}}</span>
-            </div>
-
-            <ul class="summary">
-                <li>
-                    {{labels.level}}
-                </li>
-                <li>
-                    {{labels.school}}
-                </li>
-                <li>
-                    <input type="text" name="data.source" value="{{data.source}}" placeholder="{{ localize 'SW5E.Source' }}"/>
-                </li>
-            </ul>
-        </div>
-    </header>
-
-    {{!-- Item Sheet Navigation --}}
-    <nav class="sheet-navigation tabs" data-group="primary">
-        <a class="item active" data-tab="description">{{ localize "SW5E.Description" }}</a>
-        <a class="item" data-tab="details">{{ localize "SW5E.Details" }}</a>
-    </nav>
-
-    {{!-- Item Sheet Body --}}
-    <section class="sheet-body">
-
-        {{!-- Description Tab --}}
-        {{> "systems/sw5e/templates/items/parts/item-description.html"}}
-
-        {{!-- Details Tab --}}
-        <div class="tab details" data-group="primary" data-tab="details">
-            <h3 class="form-header">{{ localize "SW5E.CastDetails" }}</h3>
-
-            {{!-- Cast Level --}}
-            <div class="form-group">
-                <label>{{ localize "SW5E.CastLevel" }}</label>
-                <select name="data.level" data-dtype="Number">
-                    {{#select data.level}}
-                    {{#each config.castLevels as |name lvl|}}
-                    <option value="{{lvl}}">{{name}}</option>
-                    {{/each}}
-                    {{/select}}
-                </select>
-            </div>
-
-            {{!-- Cast School --}}
-            <div class="form-group">
-                <label>{{ localize "SW5E.CastSchool" }}</label>
-                <select name="data.school">
-                    {{#select data.school}}
-                    {{#each config.castSchools as |name sch|}}
-                    <option value="{{sch}}">{{name}}</option>
-                    {{/each}}
-                    {{/select}}
-                </select>
-            </div>
-
-            {{!-- Cast Components --}}
-            <div class="cast-components form-group stacked">
-                <label>{{ localize "SW5E.CastComponents" }}</label>
-                <label class="checkbox">
-                    <input type="checkbox" name="data.components.vocal" {{checked data.components.vocal}}/> {{ localize "SW5E.ComponentVerbal" }}
-                </label>
-                <label class="checkbox">
-                    <input type="checkbox" name="data.components.somatic" {{checked data.components.somatic}}/> {{ localize "SW5E.ComponentSomatic" }}
-                </label>
-                <label class="checkbox">
-                    <input type="checkbox" name="data.components.material" {{checked data.components.material}}/> {{ localize "SW5E.ComponentMaterial" }}
-                </label>
-                <label class="checkbox">
-                    <input type="checkbox" name="data.components.concentration" {{checked data.components.concentration}}/> {{ localize "SW5E.Concentration" }}
-                </label>
-                <label class="checkbox">
-                    <input type="checkbox" name="data.components.ritual" {{checked data.components.ritual}}/> {{ localize "SW5E.Ritual" }}
-                </label>
-            </div>
-
-            {{!-- Material Components --}}
-            <div class="form-group stacked">
-                <label>{{ localize "SW5E.CastMaterials" }}</label>
-                <input class="materials" type="text" name="data.materials.value" value="{{data.materials.value}}"/>
-                {{#if data.materials.value}}
-                <div class="cast-materials flexrow">
-                    <label>{{ localize "SW5E.Supply" }}</label>
-                    <input type="text" name="data.materials.supply" value="{{data.materials.supply}}" data-dtype="Number" Placeholder="0"/>
-                    <label>{{ localize "SW5E.CostGP" }}</label>
-                    <input type="text" name="data.materials.cost" value="{{data.materials.cost}}" data-dtype="Number" Placeholder="-"/>
-                    <label>{{ localize "SW5E.Consumed" }}</label>
-                    <input type="checkbox" name="data.materials.consumed" {{checked data.materials.consumed}}/>
-                </div>
-                {{/if}}
-            </div>
-
-            {{!-- Preparation Mode --}}
-            <div class="form-group input-select">
-                <label>{{ localize "SW5E.CastPreparationMode" }}</label>
-                <div class="form-fields">
-                    <label class="checkbox prepared">
-                        {{ localize "SW5E.CastPrepared" }} <input type="checkbox" name="data.preparation.prepared" {{checked data.preparation.prepared}}/>
-                    </label>
-                    <select name="data.preparation.mode">
-                        {{#select data.preparation.mode}}
-                        <option value=""></option>
-                        {{#each config.castPreparationModes as |name key|}}
-                        <option value="{{key}}">{{name}}</option>
-                        {{/each}}
-                        {{/select}}
-                    </select>
-                </div>
-            </div>
-
-            <h3 class="form-header">{{ localize "SW5E.CastingHeader" }}</h3>
-
-            {{!-- Item Activation Template --}}
-            {{> "systems/sw5e/templates/items/parts/item-activation.html"}}
-
-            <h3 class="form-header">{{ localize "SW5E.CastEffects" }}</h3>
-
-            {{!-- Item Action Template --}}
-            {{> "systems/sw5e/templates/items/parts/item-action.html"}}
-
-            {{!-- Cast Level Scaling --}}
-            <div class="form-group">
-                <label>{{ localize "SW5E.LevelScaling" }}</label>
-                <div class="form-fields">
-                    <select name="data.scaling.mode">
-                        {{#select data.scaling.mode}}
-                        {{#each config.castScalingModes as |name key|}}
-                        <option value="{{key}}">{{name}}</option>
-                        {{/each}}
-                        {{/select}}
-                    </select>
-                    <input type="text" name="data.scaling.formula" value="{{data.scaling.formula}}" placeholder="{{ localize 'SW5E.ScalingFormula' }}"/>
-                </div>
-            </div>
-        </div>
-    </section>
-</form>

templates/items/classfeature.html

@@ -32,6 +32,7 @@
     <nav class="sheet-navigation tabs" data-group="primary">
         <a class="item active" data-tab="description">{{ localize "SW5E.Description" }}</a>
         <a class="item" data-tab="details">{{ localize "SW5E.Details" }}</a>
+        <a class="item" data-tab="effects">{{ localize "SW5E.Effects" }}</a>
     </nav>
 
     {{!-- Item Sheet Body --}}
@@ -69,5 +70,11 @@
             {{!-- Item Action Template --}}
             {{> "systems/sw5e/templates/items/parts/item-action.html"}}
         </div>
+        
+        {{!-- Effects Tab --}}
+        <div class="tab effects flexcol" data-group="primary" data-tab="effects">
+            {{> "systems/sw5e/templates/actors/parts/active-effects.html"}}
+        </div>
+
     </section>
 </form>

templates/items/consumable.html

@@ -32,6 +32,7 @@
     <nav class="sheet-navigation tabs" data-group="primary">
         <a class="item active" data-tab="description">{{ localize "SW5E.Description" }}</a>
         <a class="item" data-tab="details">{{ localize "SW5E.Details" }}</a>
+        <a class="item" data-tab="effects">{{ localize "SW5E.Effects" }}</a>
     </nav>
 
     {{!-- Item Sheet Body --}}
@@ -86,5 +87,10 @@
             {{!-- Item Action Template --}}
             {{> "systems/sw5e/templates/items/parts/item-action.html"}}
         </div>
+
+        {{!-- Effects Tab --}}
+        <div class="tab effects flexcol" data-group="primary" data-tab="effects">
+            {{> "systems/sw5e/templates/actors/parts/active-effects.html"}}
+        </div>
     </section>
 </form>

templates/items/equipment.html

@@ -32,6 +32,7 @@
     <nav class="sheet-navigation tabs" data-group="primary">
         <a class="item active" data-tab="description">{{ localize "SW5E.Description" }}</a>
         <a class="item" data-tab="details">{{ localize "SW5E.Details" }}</a>
+        <a class="item" data-tab="effects">{{ localize "SW5E.Effects" }}</a>
     </nav>
 
     {{!-- Item Sheet Body --}}
@@ -142,5 +143,10 @@
             {{!-- Item Action Template --}}
             {{> "systems/sw5e/templates/items/parts/item-action.html"}}
         </div>
+
+        {{!-- Effects Tab --}}
+        <div class="tab effects flexcol" data-group="primary" data-tab="effects">
+            {{> "systems/sw5e/templates/actors/parts/active-effects.html"}}
+        </div>
     </section>
 </form>

templates/items/feat.html

@@ -32,6 +32,7 @@
     <nav class="sheet-navigation tabs" data-group="primary">
         <a class="item active" data-tab="description">{{ localize "SW5E.Description" }}</a>
         <a class="item" data-tab="details">{{ localize "SW5E.Details" }}</a>
+        <a class="item" data-tab="effects">{{ localize "SW5E.Effects" }}</a>
     </nav>
 
     {{!-- Item Sheet Body --}}
@@ -69,5 +70,11 @@
             {{!-- Item Action Template --}}
             {{> "systems/sw5e/templates/items/parts/item-action.html"}}
         </div>
+
+        {{!-- Effects Tab --}}
+        <div class="tab effects flexcol" data-group="primary" data-tab="effects">
+            {{> "systems/sw5e/templates/actors/parts/active-effects.html"}}
+        </div>
+        
     </section>
 </form>

templates/items/fightingmastery.html

@@ -24,6 +24,7 @@
     {{!-- Item Sheet Navigation --}}
     <nav class="sheet-navigation tabs" data-group="primary">
         <a class="item active" data-tab="description">{{ localize "SW5E.Description" }}</a>
+        <a class="item" data-tab="effects">{{ localize "SW5E.Effects" }}</a>
         <!-- <a class="item" data-tab="details">{{ localize "SW5E.Details" }}</a> -->
     </nav>
 
@@ -36,36 +37,11 @@
 		  {{editor content=data.description.value target="data.description.value" button=true editable=editable}}
 
         </div>    
- <!--    {{> "systems/sw5e/templates/items/parts/item-description.html"}}
+        
+        {{!-- Effects Tab --}}
+        <div class="tab effects flexcol" data-group="primary" data-tab="effects">
+            {{> "systems/sw5e/templates/actors/parts/active-effects.html"}}
+        </div>
 
-        {{!-- Details Tab --}}
-        <div class="tab details" data-group="primary" data-tab="details">
-
-            <h3 class="form-header">{{ localize "SW5E.FeatureUsage" }}</h3>
-
-            {{!-- Item Activation Template --}}
-            {{> "systems/sw5e/templates/items/parts/item-activation.html"}}
-
-            {{!-- Recharge Requirement --}}
-            {{#if data.activation.type}}
-            <div class="form-group recharge">
-                <label>{{ localize "SW5E.FeatureActionRecharge" }}</label>
-                <div class="form-fields">
-                    <span>{{ localize "SW5E.FeatureRechargeOn" }}</span>
-                    <input type="text" name="data.recharge.value" value="{{data.recharge.value}}"
-                           data-dtype="Number" placeholder="{{ localize 'SW5E.FeatureRechargeResult' }}"/>
-                    <label class="checkbox">
-                        {{ localize "SW5E.Charged" }}
-                        <input type="checkbox" name="data.recharge.charged" {{checked data.recharge.charged}}/>
-                    </label>
-                </div>
-            </div>
-            {{/if}}
-
-            <h3 class="form-header">{{ localize "SW5E.FeatureAttack" }}</h3>
-
-            {{!-- Item Action Template --}}
-            {{> "systems/sw5e/templates/items/parts/item-action.html"}}
-        </div> -->
     </section>
 </form>

templates/items/fightingstyle.html

@@ -24,6 +24,7 @@
     {{!-- Item Sheet Navigation --}}
     <nav class="sheet-navigation tabs" data-group="primary">
         <a class="item active" data-tab="description">{{ localize "SW5E.Description" }}</a>
+        <a class="item" data-tab="effects">{{ localize "SW5E.Effects" }}</a>
         <!-- <a class="item" data-tab="details">{{ localize "SW5E.Details" }}</a> -->
     </nav>
 
@@ -36,36 +37,11 @@
 		  {{editor content=data.description.value target="data.description.value" button=true editable=editable}}
 
         </div>    
- <!--    {{> "systems/sw5e/templates/items/parts/item-description.html"}}
+        
+        {{!-- Effects Tab --}}
+        <div class="tab effects flexcol" data-group="primary" data-tab="effects">
+            {{> "systems/sw5e/templates/actors/parts/active-effects.html"}}
+        </div>
 
-        {{!-- Details Tab --}}
-        <div class="tab details" data-group="primary" data-tab="details">
-
-            <h3 class="form-header">{{ localize "SW5E.FeatureUsage" }}</h3>
-
-            {{!-- Item Activation Template --}}
-            {{> "systems/sw5e/templates/items/parts/item-activation.html"}}
-
-            {{!-- Recharge Requirement --}}
-            {{#if data.activation.type}}
-            <div class="form-group recharge">
-                <label>{{ localize "SW5E.FeatureActionRecharge" }}</label>
-                <div class="form-fields">
-                    <span>{{ localize "SW5E.FeatureRechargeOn" }}</span>
-                    <input type="text" name="data.recharge.value" value="{{data.recharge.value}}"
-                           data-dtype="Number" placeholder="{{ localize 'SW5E.FeatureRechargeResult' }}"/>
-                    <label class="checkbox">
-                        {{ localize "SW5E.Charged" }}
-                        <input type="checkbox" name="data.recharge.charged" {{checked data.recharge.charged}}/>
-                    </label>
-                </div>
-            </div>
-            {{/if}}
-
-            <h3 class="form-header">{{ localize "SW5E.FeatureAttack" }}</h3>
-
-            {{!-- Item Action Template --}}
-            {{> "systems/sw5e/templates/items/parts/item-action.html"}}
-        </div> -->
     </section>
 </form>

templates/items/lightsaberform.html

@@ -24,6 +24,7 @@
     {{!-- Item Sheet Navigation --}}
     <nav class="sheet-navigation tabs" data-group="primary">
         <a class="item active" data-tab="description">{{ localize "SW5E.Description" }}</a>
+        <a class="item" data-tab="effects">{{ localize "SW5E.Effects" }}</a>
         <!-- <a class="item" data-tab="details">{{ localize "SW5E.Details" }}</a> -->
     </nav>
 
@@ -36,36 +37,11 @@
 		  {{editor content=data.description.value target="data.description.value" button=true editable=editable}}
 
         </div>    
- <!--    {{> "systems/sw5e/templates/items/parts/item-description.html"}}
+        
+        {{!-- Effects Tab --}}
+        <div class="tab effects flexcol" data-group="primary" data-tab="effects">
+            {{> "systems/sw5e/templates/actors/parts/active-effects.html"}}
+        </div>
 
-        {{!-- Details Tab --}}
-        <div class="tab details" data-group="primary" data-tab="details">
-
-            <h3 class="form-header">{{ localize "SW5E.FeatureUsage" }}</h3>
-
-            {{!-- Item Activation Template --}}
-            {{> "systems/sw5e/templates/items/parts/item-activation.html"}}
-
-            {{!-- Recharge Requirement --}}
-            {{#if data.activation.type}}
-            <div class="form-group recharge">
-                <label>{{ localize "SW5E.FeatureActionRecharge" }}</label>
-                <div class="form-fields">
-                    <span>{{ localize "SW5E.FeatureRechargeOn" }}</span>
-                    <input type="text" name="data.recharge.value" value="{{data.recharge.value}}"
-                           data-dtype="Number" placeholder="{{ localize 'SW5E.FeatureRechargeResult' }}"/>
-                    <label class="checkbox">
-                        {{ localize "SW5E.Charged" }}
-                        <input type="checkbox" name="data.recharge.charged" {{checked data.recharge.charged}}/>
-                    </label>
-                </div>
-            </div>
-            {{/if}}
-
-            <h3 class="form-header">{{ localize "SW5E.FeatureAttack" }}</h3>
-
-            {{!-- Item Action Template --}}
-            {{> "systems/sw5e/templates/items/parts/item-action.html"}}
-        </div> -->
     </section>
 </form>

templates/items/loot.html

@@ -25,8 +25,26 @@
         </div>
     </header>
 
+    {{!-- Item Sheet Navigation --}}
+    <nav class="sheet-navigation tabs" data-group="primary">
+        <a class="item active" data-tab="description">{{ localize "SW5E.Description" }}</a>
+        <a class="item" data-tab="effects">{{ localize "SW5E.Effects" }}</a>
+        <!-- <a class="item" data-tab="details">{{ localize "SW5E.Details" }}</a> -->
+    </nav>
+
     {{!-- Item Sheet Body --}}
     <section class="sheet-body">
-        {{> "systems/sw5e/templates/items/parts/item-description.html"}}
+
+        {{!-- Description Tab --}}
+        <div class="tab description" data-group="primary" data-tab="description">
+          {{> "systems/sw5e/templates/items/parts/item-description.html"}}
+
+        </div>    
+        
+        {{!-- Effects Tab --}}
+        <div class="tab effects flexcol" data-group="primary" data-tab="effects">
+            {{> "systems/sw5e/templates/actors/parts/active-effects.html"}}
+        </div>
+
     </section>
 </form>

templates/items/parts/item-activation.html

@@ -112,8 +112,9 @@
     <label>{{ localize "SW5E.LimitedUses" }}</label>
     <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>
+        <span class="sep">{{ localize "SW5E.of" }}</span>
         <input type="text" name="data.uses.max" value="{{data.uses.max}}" data-dtype="Number"/>
+        <span class="sep">{{ localize "SW5E.per" }}</span>
         <select name="data.uses.per">
             {{#select data.uses.per}}
             <option value=""></option>

templates/items/power.html

@@ -32,6 +32,7 @@
     <nav class="sheet-navigation tabs" data-group="primary">
         <a class="item active" data-tab="description">{{ localize "SW5E.Description" }}</a>
         <a class="item" data-tab="details">{{ localize "SW5E.Details" }}</a>
+        <a class="item" data-tab="effects">{{ localize "SW5E.Effects" }}</a>
     </nav>
 
     {{!-- Item Sheet Body --}}
@@ -68,6 +69,30 @@
                 </select>
             </div>
 
+            {{!-- Power Components --}}
+            <div class="power-components form-group stacked">
+                <label>{{ localize "SW5E.PowerComponents" }}</label>
+                <label class="checkbox">
+                    <input type="checkbox" name="data.components.concentration" {{checked data.components.concentration}}/> {{ localize "SW5E.Concentration" }}
+                </label>
+            </div>
+
+            {{!-- Material Components --}}
+            <div class="form-group stacked">
+                <label>{{ localize "SW5E.PowerMaterials" }}</label>
+                <input class="materials" type="text" name="data.materials.value" value="{{data.materials.value}}"/>
+                {{#if data.materials.value}}
+                <div class="power-materials flexrow">
+                    <label>{{ localize "SW5E.Supply" }}</label>
+                    <input type="text" name="data.materials.supply" value="{{data.materials.supply}}" data-dtype="Number" Placeholder="0"/>
+                    <label>{{ localize "SW5E.CostGP" }}</label>
+                    <input type="text" name="data.materials.cost" value="{{data.materials.cost}}" data-dtype="Number" Placeholder="-"/>
+                    <label>{{ localize "SW5E.Consumed" }}</label>
+                    <input type="checkbox" name="data.materials.consumed" {{checked data.materials.consumed}}/>
+                </div>
+                {{/if}}
+            </div>
+
             {{!-- Preparation Mode --}}
             <div class="form-group input-select">
                 <label>{{ localize "SW5E.PowerPreparationMode" }}</label>
@@ -76,24 +101,10 @@
                         {{ localize "SW5E.PowerPrepared" }} <input type="checkbox" name="data.preparation.prepared" {{checked data.preparation.prepared}}/>
                     </label>
                     <select name="data.preparation.mode">
-                        {{#select data.preparation.mode}}
-                        <option value=""></option>
-                        {{#each config.powerPreparationModes as |name key|}}
-                        <option value="{{key}}">{{name}}</option>
-                        {{/each}}
-                        {{/select}}
+                        {{ selectOptions config.powerPreparationModes selected=data.preparation.mode }}
                     </select>
                 </div>
             </div>
-            {{!-- Concentration Mode --}}
-            <div class="form-group input-select">
-                <label>{{ localize "SW5E.PowerConcentrationMode" }}</label>
-                <div class="form-fields">
-                    <label class="checkbox">
-                        <input type="checkbox" name="data.components.concentration" {{checked data.components.concentration}}/> {{ localize "SW5E.Concentrated" }}
-                    </label>
-                </div>
-            </div>
 
             <h3 class="form-header">{{ localize "SW5E.PowerCastingHeader" }}</h3>
 
@@ -120,5 +131,10 @@
                 </div>
             </div>
         </div>
+
+        {{!-- Effects Tab --}}
+        <div class="tab effects flexcol" data-group="primary" data-tab="effects">
+            {{> "systems/sw5e/templates/actors/parts/active-effects.html"}}
+        </div>
     </section>
 </form>

templates/items/species.html

@@ -26,6 +26,7 @@
     <nav class="sheet-navigation tabs" data-group="primary">
         <a class="item active" data-tab="description">Description</a>
         <a class="item" data-tab="species-traits">Species Traits</a>
+        <a class="item" data-tab="effects">{{ localize "SW5E.Effects" }}</a>
     </nav>
 
     {{!-- Item Sheet Body --}}
@@ -110,8 +111,11 @@
 		{{editor content=data.traits.value target="data.traits.value" button=true editable=editable}}
 		</span>
 		</div>
-		
+        
+        {{!-- Effects Tab --}}
+        <div class="tab effects flexcol" data-group="primary" data-tab="effects">
+            {{> "systems/sw5e/templates/actors/parts/active-effects.html"}}
+        </div>
+
 	</section>
-
-
 </form>

templates/items/weapon.html

@@ -32,6 +32,7 @@
     <nav class="sheet-navigation tabs" data-group="primary">
         <a class="item active" data-tab="description">{{ localize "SW5E.Description" }}</a>
         <a class="item" data-tab="details">{{ localize "SW5E.Details" }}</a>
+        <a class="item" data-tab="effects">{{ localize "SW5E.Effects" }}</a>
     </nav>
 
     {{!-- Item Sheet Body --}}
@@ -110,5 +111,10 @@
             {{!-- Item Action Template --}}
             {{> "systems/sw5e/templates/items/parts/item-action.html"}}
         </div>
+
+        {{!-- Effects Tab --}}
+        <div class="tab effects flexcol" data-group="primary" data-tab="effects">
+            {{> "systems/sw5e/templates/actors/parts/active-effects.html"}}
+        </div>
     </section>
 </form>