Add token artwork and biography entries

foundryvtt · Nov 15, 2019 · 2dd0ff2 · 2dd0ff2
1 parent 89dcac2
commit 2dd0ff2
Show file tree

Hide file tree

Showing 17 changed files with 127 additions and 4 deletions.
diff --git a/module/actor/sheets/base.js b/module/actor/sheets/base.js
@@ -43,7 +43,10 @@ export class ActorSheet5e extends ActorSheet {
 
     // The Actor and its Items
     data.actor = duplicate(this.actor.data);
-    data.items = this.actor.items.map(i => i.data);
+    data.items = this.actor.items.map(i => {
+      i.data.labels = i.labels;
+      return i.data;
+    });
     data.items.sort((a, b) => (a.sort || 0) - (b.sort || 0));
     data.data = data.actor.data;
     data.labels = this.actor.labels || {};

diff --git a/packs/monsters.db b/packs/monsters.db
diff --git a/templates/actors/parts/actor-features.html b/templates/actors/parts/actor-features.html
@@ -40,15 +40,15 @@ <h4>{{item.name}}</h4>
                 {{item.data.uses.value}} / {{item.data.uses.max}}
                 {{else if item.data.recharge.value}}
                 {{#if item.isOnCooldown}}
-                <a class="item-recharge rollable">{{../../labels.recharge}}</a>
+                <a class="item-recharge rollable">{{item.labels.recharge}}</a>
                 {{else}}
                 {{localize "DND5E.Charged"}}
                 {{/if}}
                 {{/if}}
             </div>
             <div class="item-detail item-action">
                 {{#if item.data.activation.type }}
-                {{../../labels.activation}}
+                {{item.labels.activation}}
                 {{/if}}
             </div>
 

diff --git a/templates/actors/parts/actor-inventory.html b/templates/actors/parts/actor-inventory.html
@@ -78,7 +78,7 @@ <h4>
 
             <div class="item-detail item-action">
                 {{#if item.data.activation.type }}
-                {{labels.activation}}
+                {{item.labels.activation}}
                 {{/if}}
             </div>
 

diff --git a/tokens/beast/ConstrictorSnake.png b/tokens/beast/ConstrictorSnake.png
diff --git a/tokens/beast/DraftHorse.png b/tokens/beast/DraftHorse.png
diff --git a/tokens/beast/Elk.png b/tokens/beast/Elk.png
diff --git a/tokens/beast/GiantConstrictorSnake.png b/tokens/beast/GiantConstrictorSnake.png
diff --git a/tokens/beast/GiantCoralSnake.png b/tokens/beast/GiantCoralSnake.png
diff --git a/tokens/beast/GiantElk.png b/tokens/beast/GiantElk.png
diff --git a/tokens/beast/GiantWolfSpider.png b/tokens/beast/GiantWolfSpider.png
diff --git a/tokens/beast/RidingHorse.png b/tokens/beast/RidingHorse.png
diff --git a/tokens/dragon/Pseudodragon.png b/tokens/dragon/Pseudodragon.png
diff --git a/tokens/fiend/Dretch.png b/tokens/fiend/Dretch.png
diff --git a/tokens/humanoid/Acolyte.png b/tokens/humanoid/Acolyte.png
diff --git a/tokens/undead/Demilich.png b/tokens/undead/Demilich.png
diff --git a/tokens/undead/Flameskull.png b/tokens/undead/Flameskull.png