Fixed Title's embed items tooltips.

This commit is contained in:
Vlyan
2021-08-12 12:42:30 +02:00
parent 0d7ddddaee
commit d13ec4049c
6 changed files with 11 additions and 5 deletions

View File

@@ -9,6 +9,7 @@
- Fixes for RnK : - Fixes for RnK :
- Visibility mode is now consistent with the 1st message (public, private, gm...). - Visibility mode is now consistent with the 1st message (public, private, gm...).
- DiceSoNice will now not show the new dice(s) for explosive in non-public mode. - DiceSoNice will now not show the new dice(s) for explosive in non-public mode.
- Fixed Title's embed items tooltips.
- Minor fixe on editable state. - Minor fixe on editable state.
## 1.3.2 - Ronin's Bubble ## 1.3.2 - Ronin's Bubble

View File

@@ -175,7 +175,7 @@ export class TwentyQuestionsDialog extends FormApplication {
super.activateListeners(html); super.activateListeners(html);
// Commons // Commons
game.l5r5e.HelpersL5r5e.commonListeners(html); game.l5r5e.HelpersL5r5e.commonListeners(html, this.actor);
// BT Next // BT Next
html.find(".next").on("click", (event) => { html.find(".next").on("click", (event) => {

View File

@@ -469,7 +469,12 @@ export class HelpersL5r5e {
item = await HelpersL5r5e.getObjectGameOrPack({ id: propertyId, type: "Item" }); item = await HelpersL5r5e.getObjectGameOrPack({ id: propertyId, type: "Item" });
} else if (itemParentId) { } else if (itemParentId) {
// Embed Item // Embed Item
const parentItem = actor.items.get(itemParentId); let parentItem;
if (actor) {
parentItem = actor.items?.get(itemParentId);
} else {
parentItem = game.items.get(itemParentId);
}
if (!parentItem) { if (!parentItem) {
return; return;
} }

View File

@@ -113,7 +113,7 @@ export class ItemSheetL5r5e extends ItemSheet {
super.activateListeners(html); super.activateListeners(html);
// Commons // Commons
game.l5r5e.HelpersL5r5e.commonListeners(html); game.l5r5e.HelpersL5r5e.commonListeners(html, this.actor);
// Everything below here is only needed if the sheet is editable // Everything below here is only needed if the sheet is editable
if (!this.isEditable) { if (!this.isEditable) {

View File

@@ -1,5 +1,5 @@
<tr class="flexrow row advancement"> <tr class="flexrow row advancement">
<td class="name l5r5e-tooltip" data-item-id="{{advancement._id}}" name="advancement.name"><img src="{{advancement.img}}" title="{{advancement.name}}"> {{advancement.name}}{{#if advancement.data.bond_type}} ({{advancement.data.bond_type}}){{/if}}</td> <td class="name l5r5e-tooltip" data-item-id="{{advancement._id}}" {{#if parent_id}}data-item-parent-id="{{parent_id}}"{{/if}} name="advancement.name"><img src="{{advancement.img}}" title="{{advancement.name}}"> {{advancement.name}}{{#if advancement.data.bond_type}} ({{advancement.data.bond_type}}){{/if}}</td>
{{#if show_curriculum_toggle}}<td class="curriculum" name="curriculum">{{#if advancement.data.in_curriculum}}<i class="fas fa-graduation-cap"></i> {{/if}}</td>{{/if}} {{#if show_curriculum_toggle}}<td class="curriculum" name="curriculum">{{#if advancement.data.in_curriculum}}<i class="fas fa-graduation-cap"></i> {{/if}}</td>{{/if}}
<td class="xp" name="advancement.xp">{{#if advancement.data.xp_used_total}}{{advancement.data.xp_used_total}}{{else}}{{advancement.data.xp_used}}{{/if}}</td> <td class="xp" name="advancement.xp">{{#if advancement.data.xp_used_total}}{{advancement.data.xp_used_total}}{{else}}{{advancement.data.xp_used}}{{/if}}</td>
<td class="rank" name="advancement.rank">{{advancement.data.rank}}</td> <td class="rank" name="advancement.rank">{{advancement.data.rank}}</td>

View File

@@ -51,7 +51,7 @@
</thead> </thead>
<tbody class="flex"> <tbody class="flex">
{{#each data.embedItemsList as |advancement|}} {{#each data.embedItemsList as |advancement|}}
{{> 'systems/l5r5e/templates/actors/character/advancement-others.html' advancement=advancement show_curriculum_toggle=true editable=../options.editable}} {{> 'systems/l5r5e/templates/actors/character/advancement-others.html' advancement=advancement show_curriculum_toggle=true editable=../options.editable parent_id=../data._id}}
{{/each}} {{/each}}
</tbody> </tbody>
<tfoot> <tfoot>