Finish core upgrade to 1.3.5

Filled in some missing pieces in html for core upgrades.  Looked mostly good on both Cyr and Jacob's accounts.

I had a few questions about differences that were added from DND5e, they are as follows:

less\original\npc.less
	line 34 - is the "li" before .creature-type necessary, not in dnd5e

module\item\entity.js
	line 685 - dnd is game.user._id, we have game.user.data._id

module\pixi\ability-template.js
	line 22- dnd is game.user._id, we have game.user.data._id

templates\chat\item-card.html
	line 1- dnd has actor._id, we have actor.data._id

templates/actors/newActor/npc-sheet.html

@@ -97,13 +97,13 @@
                                     value="{{ability.value}}" data-dtype="Number" placeholder="10" />
                                 <div class="ability-modifiers">
                                     <span class="ability-mod"
-                                        title="Modifier">{{numberFormat ability.mod decimals=0 sign=true}}</span>
+                                        title="{{ localize 'SW5E.Modifier' }}">{{numberFormat ability.mod decimals=0 sign=true}}</span>
                                     <input type="hidden" name="data.abilities.{{id}}.proficient"
                                         value="{{ability.proficient}}" data-dtype="Number" />
                                     <button class="proficiency-toggle ability-proficiency"
                                         title="Proficiency">{{{ability.icon}}}</button>
                                     <span class="ability-save"
-                                        title="Saving Throw">{{numberFormat ability.save decimals=0 sign=true}}</span>
+                                        title="{{ localize 'SW5E.SavingThrow' }}">{{numberFormat ability.save decimals=0 sign=true}}</span>
                                 </div>
                         </li>
                         {{/each}}

templates/actors/newActor/parts/swalt-active-effects.html

@@ -3,8 +3,8 @@
 {{#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="effect-source">{{localize "SW5E.Source"}}</div>
+        <div class="effect-source">{{localize "SW5E.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"}}

templates/actors/newActor/parts/swalt-core.html

@@ -10,13 +10,13 @@
                         value="{{ability.value}}" data-dtype="Number" placeholder="10" />
                     <div class="ability-modifiers">
                         <span class="ability-mod"
-                            title="Modifier">{{numberFormat ability.mod decimals=0 sign=true}}</span>
+                        title="{{ localize 'SW5E.Modifier' }}">{{numberFormat ability.mod decimals=0 sign=true}}</span>
                         <input type="hidden" name="data.abilities.{{id}}.proficient"
                             value="{{ability.proficient}}" data-dtype="Number" />
                         <button class="proficiency-toggle ability-proficiency"
                             title="Proficiency">{{{ability.icon}}}</button>
                         <span class="ability-save"
-                            title="Saving Throw">{{numberFormat ability.save decimals=0 sign=true}}</span>
+                            title="{{ localize 'SW5E.SavingThrow' }}">{{numberFormat ability.save decimals=0 sign=true}}</span>
                     </div>
             </li>
             {{/each}}

templates/actors/newActor/parts/swalt-crew.html

@@ -66,7 +66,7 @@
 <!--                        {{item.data.hitDice}} -->
                     </div>
                     <div class="item-detail player-class-levels">
-                        <strong>Level {{item.data.levels}}</strong> &nbsp;&nbsp;<a class="increment-class-level"><i style="color:#c40f0f; text-shadow: 0 1px 2px gray;" class="fas fa-arrow-up"></i></a> &nbsp;&nbsp;<a class="decrement-class-level"><i style="color:#c40f0f; text-shadow: 0 1px 2px gray" class="fas fa-arrow-down"></i></a>
+                        <strong>{{localize "SW5E.Level"}} {{item.data.levels}}</strong> &nbsp;&nbsp;<a class="increment-class-level"><i style="color:#c40f0f; text-shadow: 0 1px 2px gray;" class="fas fa-arrow-up"></i></a> &nbsp;&nbsp;<a class="decrement-class-level"><i style="color:#c40f0f; text-shadow: 0 1px 2px gray" class="fas fa-arrow-down"></i></a>
 <!--				    {{#if ../owner}}
                     <a class="item-control item-create" title="{{localize 'SW5E.LevelAdd'}}"
                         {{#each item.data.levels as |v k|}}data-{{k}}="{{v}}" {{/each}}>
@@ -78,8 +78,8 @@
 
                     {{#if ../../owner}}
                     <div class="item-controls item-detail">
-                        <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                        <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                        <a class="item-control item-edit" title="{{localize 'SW5E.ItemEdit'}}"><i class="fas fa-edit"></i></a>
+                        <a class="item-control item-delete" title="{{localize 'SW5E.ItemDelete'}}"><i class="fas fa-trash"></i></a>
                     </div>
                     {{/if}}
                 </li>

templates/actors/newActor/parts/swalt-features.html

@@ -38,8 +38,11 @@
                 {{#each section.items as |item iid|}}
                 <li class="item group-grid-features {{#if isDepleted}}depleted{{/if}}" data-item-id="{{item._id}}">
                     <div class="item-name rollable">
-                        <div class="item-image" style="background-image: url({{item.img}})"></div>
-                        <h4>{{item.name}}</h4>
+                        <div class="item-image" style="background-image: url('{{item.img}}')"></div>
+                        <h4>
+                            {{item.name}}
+                            {{#if item.isOriginalClass}} <i class="original-class fas fa-sun" title="{{localize 'SW5E.ClassOriginal'}}"></i>{{/if}}
+                        </h4>
                     </div>
 
                     {{#if section.hasActions}}
@@ -66,7 +69,7 @@
 <!--                        {{item.data.hitDice}} -->
                     </div>
                     <div class="item-detail player-class-levels">
-                        <strong>Level {{item.data.levels}}</strong> &nbsp;&nbsp;<a class="increment-class-level"><i style="color:#c40f0f; text-shadow: 0 1px 2px gray;" class="fas fa-arrow-up"></i></a> &nbsp;&nbsp;<a class="decrement-class-level"><i style="color:#c40f0f; text-shadow: 0 1px 2px gray" class="fas fa-arrow-down"></i></a>
+                        <strong>{{localize "SW5E.Level"}} {{item.data.levels}}</strong> &nbsp;&nbsp;<a class="increment-class-level"><i style="color:#c40f0f; text-shadow: 0 1px 2px gray;" class="fas fa-arrow-up"></i></a> &nbsp;&nbsp;<a class="decrement-class-level"><i style="color:#c40f0f; text-shadow: 0 1px 2px gray" class="fas fa-arrow-down"></i></a>
 <!--				    {{#if ../owner}}
                     <a class="item-control item-create" title="{{localize 'SW5E.LevelAdd'}}"
                         {{#each item.data.levels as |v k|}}data-{{k}}="{{v}}" {{/each}}>
@@ -78,8 +81,8 @@
 
                     {{#if ../../owner}}
                     <div class="item-controls item-detail">
-                        <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                        <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                        <a class="item-control item-edit" title="{{localize 'SW5E.ItemEdit'}}"><i class="fas fa-edit"></i></a>
+                        <a class="item-control item-delete" title="{{localize 'SW5E.ItemDelete'}}"><i class="fas fa-trash"></i></a>
                     </div>
                     {{/if}}
                 </li>

templates/actors/newActor/parts/swalt-force-powerbook.html

@@ -110,7 +110,7 @@
                     <div class="item-detail item-target" title="{{localize 'SW5E.Range'}}: {{labels.range}}">
                         {{#if labels.target}}
                         {{labels.target}}
-                        {{else}}None
+                        {{else}}{{localize 'SW5E.None'}}
                         {{/if}}
                     </div>
 
@@ -120,8 +120,8 @@
                         <a class="item-control item-toggle {{item.toggleClass}}" title="{{item.toggleTitle}}"><i
                                 class="fas fa-check-circle"></i></a>
                         {{/if}}
-                        <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                        <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                        <a class="item-control item-edit" title="{{localize 'SW5E.ItemEdit'}}"><i class="fas fa-edit"></i></a>
+                        <a class="item-control item-delete" title="{{localize 'SW5E.ItemDelete'}}"><i class="fas fa-trash"></i></a>
                     </div>
                     {{/if}}
                 </li>

templates/actors/newActor/parts/swalt-inventory.html

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

templates/actors/newActor/parts/swalt-tech-powerbook.html

@@ -92,7 +92,7 @@
                     <div class="item-detail item-target" title="{{localize 'SW5E.Range'}}: {{labels.range}}">
                         {{#if labels.target}}
                         {{labels.target}}
-                        {{else}}None
+                        {{else}}{{localize 'SW5E.None'}}
                         {{/if}}
                     </div>
 
@@ -102,8 +102,8 @@
                         <a class="item-control item-toggle {{item.toggleClass}}" title="{{item.toggleTitle}}"><i
                                 class="fas fa-check-circle"></i></a>
                         {{/if}}
-                        <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                        <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                        <a class="item-control item-edit" title="{{localize 'SW5E.ItemEdit'}}"><i class="fas fa-edit"></i></a>
+                        <a class="item-control item-delete" title="{{localize 'SW5E.ItemDelete'}}"><i class="fas fa-trash"></i></a>
                     </div>
                     {{/if}}
                 </li>

templates/actors/newActor/parts/swalt-traits.html

@@ -14,12 +14,12 @@
                     placeholder="0" class="value-number" />
             </div>
             <footer class="attribute-footer">
-                <label class="recharge checkbox">
-                    {{ localize "SW5E.AbbreviationSR" }} <input name="data.resources.{{res.name}}.sr" type="checkbox"
+                <label class="recharge checkbox flexcol">
+                    <span>{{ localize "SW5E.AbbreviationSR" }}</span> <input name="data.resources.{{res.name}}.sr" type="checkbox"
                         {{checked res.sr}} />
                 </label>
-                <label class="recharge checkbox">
-                    {{ localize "SW5E.AbbreviationLR" }} <input name="data.resources.{{res.name}}.lr" type="checkbox"
+                <label class="recharge checkbox flexcol">
+                    <span>{{ localize "SW5E.AbbreviationLR" }}</span> <input name="data.resources.{{res.name}}.lr" type="checkbox"
                         {{checked res.lr}} />
                 </label>
             </footer>

templates/actors/oldActor/character-sheet.html

@@ -135,10 +135,10 @@
                     <h4 class="ability-name box-title rollable">{{ability.label}}</h4>
                     <input class="ability-score" name="data.abilities.{{id}}.value" type="number" value="{{ability.value}}" placeholder="10"/>
                     <div class="ability-modifiers flexrow">
-                        <span class="ability-mod" title="Modifier">{{numberFormat ability.mod decimals=0 sign=true}}</span>
+                        <span class="ability-mod" title="{{ localize 'SW5E.Modifier' }}">{{numberFormat ability.mod decimals=0 sign=true}}</span>
                         <input type="hidden" name="data.abilities.{{id}}.proficient" value="{{ability.proficient}}" data-dtype="Number"/>
                         <a class="proficiency-toggle ability-proficiency" title="{{ localize 'SW5E.Proficiency' }}">{{{ability.icon}}}</a>
-                        <span class="ability-save" title="Saving Throw">{{numberFormat ability.save decimals=0 sign=true}}</span>
+                        <span class="ability-save" title="{{ localize 'SW5E.SavingThrow' }}">{{numberFormat ability.save decimals=0 sign=true}}</span>
                     </div>
                 </li>
             {{/each}}

templates/actors/oldActor/npc-sheet.html

@@ -98,10 +98,10 @@
                     <h4 class="ability-name box-title rollable">{{ability.label}}</h4>
                     <input class="ability-score" name="data.abilities.{{id}}.value" type="number" value="{{ability.value}}" placeholder="10"/>
                     <div class="ability-modifiers flexrow">
-                        <span class="ability-mod" title="Modifier">{{numberFormat ability.mod decimals=0 sign=true}}</span>
+                        <span class="ability-mod" title="{{ localize 'SW5E.Modifier' }}">{{numberFormat ability.mod decimals=0 sign=true}}</span>
                         <input type="hidden" name="data.abilities.{{id}}.proficient" value="{{ability.proficient}}" data-dtype="Number"/>
                         <a class="proficiency-toggle ability-proficiency" title="{{ localize 'SW5E.Proficiency' }}">{{{ability.icon}}}</a>
-                        <span class="ability-save" title="Saving Throw">{{numberFormat ability.save decimals=0 sign=true}}</span>
+                        <span class="ability-save" title="{{ localize 'SW5E.SavingThrow' }}">{{numberFormat ability.save decimals=0 sign=true}}</span>
                     </div>
                 </li>
             {{/each}}

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

@@ -101,7 +101,7 @@
                 {{item.data.archetype}}
             </div>
             <div class="item-detail item-action">
-                Level {{item.data.levels}}
+                {{localize "SW5E.Level"}} {{item.data.levels}}
             </div>
             {{/if}}
 
@@ -128,8 +128,8 @@
                     <i class="fas fa-sun"></i>
                 </a>
                 {{/if}}
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                <a class="item-control item-edit" title="{{localize 'SW5E.ItemEdit'}}"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="{{localize 'SW5E.ItemDelete'}}"><i class="fas fa-trash"></i></a>
             </div>
             {{/if}}
         </li>

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

@@ -59,11 +59,15 @@
                 <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}}
-                    {{~#if item.data.attuned}} <i class="fas fa-sun attuned" title={{localize "SW5E.Attuned"}}></i>{{/if}}
-                </h4>
+                    <h4>
+                        {{item.name~}}
+                        {{~#if item.isStack}} ({{item.data.quantity}}){{/if}}
+                    </h4>
+                    {{#if item.attunement}}
+                    <div class="item-detail attunement">
+                        <i class="fas {{item.attunement.icon}} {{item.attunement.cls}}" title="{{localize item.attunement.title}}"></i>
+                    </div>
+                    {{/if}}
                 {{/if}}
             </div>
 

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

@@ -86,7 +86,7 @@
             <div class="power-target" title="{{localize 'SW5E.Range'}}: {{labels.range}}">
                 {{#if labels.target}}
                 {{labels.target}}
-                {{else}}None
+                {{else}}{{localize 'SW5E.None'}}
                 {{/if}}
             </div>
 
@@ -95,8 +95,8 @@
                 {{#if section.canPrepare}}
                 <a class="item-control item-toggle {{item.toggleClass}}" title="{{item.toggleTitle}}"><i class="fas fa-sun"></i></a>
                 {{/if}}
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                <a class="item-control item-edit" title="{{localize 'SW5E.ItemEdit'}}"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="{{localize 'SW5E.ItemDelete'}}"><i class="fas fa-trash"></i></a>
             </div>
             {{/if}}
         </li>

templates/actors/parts/active-effects.html

@@ -2,8 +2,8 @@
 {{#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="effect-source">{{localize "SW5E.Source"}}</div>
+        <div class="effect-source">{{localize "SW5E.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"}}

templates/apps/hit-dice-config.html

@@ -11,7 +11,7 @@
                 <button class="increment" type="button">+</button>
 
                 <button class="roll-hd" data-hd-denom="{{this.diceDenom}}" {{#unless this.canRoll}}disabled{{/unless}}>
-                    <i class="fas fa-dice-d20"></i> {{ localize "Roll" }}
+                    <i class="fas fa-dice-d20"></i> {{ localize "SW5E.Roll" }}
                 </button>
             </div>
         </div>

templates/apps/long-rest.html

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

templates/apps/short-rest.html

@@ -11,7 +11,7 @@
                 {{/select}}
             </select>
             <button id="roll-hd" {{#unless canRoll}}disabled{{/unless}}>
-                <i class="fas fa-dice-d20"></i> {{ localize "Roll" }}
+                <i class="fas fa-dice-d20"></i> {{ localize "SW5E.Roll" }}
             </button>
         </div>
         {{#unless canRoll}}
@@ -21,9 +21,9 @@
     
     {{#if promptNewDay}}
     <div class="form-group">
-        <label>Is New Day?</label>
+        <label>{{ localize "SW5E.NewDay" }}</label>
         <input type="checkbox" name="newDay" {{checked newDay}}/>
-        <p class="hint">Recover limited use abilities which recharge "per day"?</p>
+        <p class="hint">{{ localize "SW5E.NewDayHint" }}</p>
     </div>
     {{/if}}