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/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>