DND5e Core 1.1.1

DND5e Core 1.1.1 with find and replace to SW5e

templates/actors/character-sheet.html

@@ -30,7 +30,7 @@
             {{!-- Character Summary --}}
             <ul class="summary flexrow">
                 <li>
-                    <input type="text" name="data.details.species" value="{{data.details.species}}" placeholder="{{ localize 'SW5E.Species' }}"/>
+                    <input type="text" name="data.details.race" value="{{data.details.race}}" placeholder="{{ localize 'SW5E.Race' }}"/>
                 </li>
                 <li>
                     <input type="text" name="data.details.background" value="{{data.details.background}}" placeholder="{{ localize 'SW5E.Background' }}"/>
@@ -46,7 +46,7 @@
             {{!-- Header Attributes --}}
             <ul class="attributes flexrow">
                 <li class="attribute health">
-                    <h4 class="attribute-name box-title">{{ localize "SW5E.Health" }}</h4>
+                    <h4 class="attribute-name box-title">{{ localize "SW5E.HitPoints" }}</h4>
                     <div class="attribute-value multiple">
                         <input name="data.attributes.hp.value" type="text" value="{{data.attributes.hp.value}}" placeholder="10" data-dtype="Number"/>
                         <span class="sep"> / </span>
@@ -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,16 +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="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">
@@ -182,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,6 +229,11 @@
             {{> "systems/sw5e/templates/actors/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 --}}
         <div class="tab flexrow" data-group="primary" data-tab="biography">
             <div class="characteristics flexcol">

templates/actors/npc-sheet.html

@@ -38,14 +38,14 @@
             {{!-- Header Attributes --}}
             <ul class="attributes flexrow">
                <li class="attribute health">
-                    <h4 class="attribute-name box-title rollable">{{ localize "SW5E.Health" }}</h4>
+                    <h4 class="attribute-name box-title rollable">{{ localize "SW5E.HitPoints" }}</h4>
                     <div class="attribute-value multiple">
                         <input name="data.attributes.hp.value" type="text" value="{{data.attributes.hp.value}}" placeholder="10" data-dtype="Number"/>
                         <span class="sep"> / </span>
                         <input name="data.attributes.hp.max" type="text" value="{{data.attributes.hp.max}}" placeholder="10" data-dtype="Number"/>
                     </div>
                     <footer class="attribute-footer">
-                        <input name="data.attributes.hp.formula" class="hpformula" type="text" placeholder="{{ localize 'SW5E.HealthFormula' }}"
+                        <input name="data.attributes.hp.formula" class="hpformula" type="text" placeholder="{{ localize 'SW5E.HPFormula' }}"
                                value="{{data.attributes.hp.formula}}"/>
                     </footer>
                 </li>
@@ -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,8 +144,8 @@
                         <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>
 
@@ -163,6 +164,11 @@
             {{> "systems/sw5e/templates/actors/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 --}}
         <div class="tab biography flexcol" data-group="primary" data-tab="biography">
             {{editor content=data.details.biography.value target="data.details.biography.value" button=true owner=owner editable=editable}}

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/actors/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/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>
@@ -59,24 +59,9 @@
                 {{/if}}
             </div>
 
-            {{else if section.isSpecies}}
-            <div class="item-detail player-species">
-
-            </div>
-			
-			{{else if section.isArchetype}}
-			<div class="item-detail player-archetype">
-			    {{item.data.name}}
-			</div>
-			
-			{{else if section.isClassfeatures}}
-			<div class="item-detail player-classfeatures">
-			    {{item.data.name}}
-			</div>
-			
             {{else if section.isClass}}
             <div class="item-detail player-class">
-                {{item.data.subclass}}
+                {{item.data.archetype}}
             </div>
             <div class="item-detail item-action">
                 Level {{item.data.levels}}
@@ -99,7 +84,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/parts/actor-inventory.html

@@ -4,7 +4,9 @@
     <ol class="currency flexrow">
         <h3>
             {{localize "SW5E.Currency"}}
-            <a class="currency-convert" title="Convert Currency"><i class="fas fa-coins"></i></a>
+            <a class="currency-convert rollable" data-action="convertCurrency" 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 +25,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 +35,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 +55,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 +84,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/parts/actor-spellbook.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/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/vehicle-sheet.html

@@ -27,7 +27,7 @@
             </ul>
             <ul class="attributes flexrow">
                 <li class="attribute health">
-                    <h4 class="attribute-name box-title">{{localize 'SW5E.Health'}}</h4>
+                    <h4 class="attribute-name box-title">{{localize 'SW5E.HitPoints'}}</h4>
                     <div class="attribute-value multiple">
                         <input name="data.attributes.hp.value" type="text" placeholder="&mdash;"
                                value="{{data.attributes.hp.value}}" data-dtype="Number">
@@ -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>