From b92d2b31121e3a7d22f48f421d52994d10cba03e Mon Sep 17 00:00:00 2001 From: Vlyan Date: Fri, 22 Jul 2022 12:43:48 +0200 Subject: [PATCH] Working on Compatibility for FVTT v10 token.img -> token.texture.src some missing data/system comp.keys() -> comp.index.keys() --- system/scripts/actors/base-character-sheet.js | 25 ++-- system/scripts/actors/character-generator.js | 21 ++-- system/scripts/dice/dice-picker-dialog.js | 2 +- system/scripts/dice/roll-n-keep-dialog.js | 8 +- system/scripts/dice/roll.js | 5 +- system/scripts/helpers.js | 2 +- system/templates/actors/actor-export.html | 112 +++++++++--------- system/templates/actors/army/army.html | 2 +- 8 files changed, 86 insertions(+), 91 deletions(-) diff --git a/system/scripts/actors/base-character-sheet.js b/system/scripts/actors/base-character-sheet.js index 21d28ee..094a423 100644 --- a/system/scripts/actors/base-character-sheet.js +++ b/system/scripts/actors/base-character-sheet.js @@ -174,12 +174,13 @@ export class BaseCharacterSheetL5r5e extends BaseSheetL5r5e { if ( this.actor.items.some((embedItem) => { // Search in children - if (embedItem.items instanceof Map && embedItem.items.has(item.data._id)) { + if (embedItem.items instanceof Map && embedItem.items.has(item._id)) { return true; } return embedItem._id === item._id; }) ) { + console.log("LR5E | This item already exist in this actor", item.uuid); return; } @@ -220,7 +221,7 @@ export class BaseCharacterSheetL5r5e extends BaseSheetL5r5e { // Add embed advancements bonus for (let [embedId, embedItem] of item.system.items) { - if (embedItem.data.type === "advancement") { + if (embedItem.type === "advancement") { await this.actor.addBonus(embedItem); } } @@ -277,14 +278,10 @@ export class BaseCharacterSheetL5r5e extends BaseSheetL5r5e { const item = this.actor.items.get(li.dataset.itemParentId)?.items.get(li.dataset.itemId); if (item) { const dragData = { - actorId: this.actor.id, - sceneId: this.actor.isToken ? canvas.scene?.id : null, - tokenId: this.actor.isToken ? this.actor.token.id : null, - pack: this.actor.pack, type: "Item", - data: foundry.utils.duplicate(item.data), + data: foundry.utils.duplicate(item), }; - dragData.data.data.parent_id = null; + dragData.data.system.parent_id = null; event.dataTransfer.setData("text/plain", JSON.stringify(dragData)); return; } @@ -450,7 +447,7 @@ export class BaseCharacterSheetL5r5e extends BaseSheetL5r5e { } // Remove 1 qty if possible - if (tmpItem.data.data.quantity > 1 && this._modifyQuantity(tmpItem.id, -1)) { + if (tmpItem.system.quantity > 1 && this._modifyQuantity(tmpItem.id, -1)) { return; } @@ -463,8 +460,8 @@ export class BaseCharacterSheetL5r5e extends BaseSheetL5r5e { case "title": // Remove embed advancements bonus - for (let [embedId, embedItem] of tmpItem.data.data.items) { - if (embedItem.data.type === "advancement") { + for (let [embedId, embedItem] of tmpItem.system.items) { + if (embedItem.type === "advancement") { await this.actor.removeBonus(embedItem); } } @@ -603,7 +600,7 @@ export class BaseCharacterSheetL5r5e extends BaseSheetL5r5e { _getWeaponSkillId(weaponId) { const item = this.actor.items.get(weaponId); if (!!item && item.type === "weapon") { - return item.data.data.skill; + return item.system.skill; } return null; } @@ -644,11 +641,11 @@ export class BaseCharacterSheetL5r5e extends BaseSheetL5r5e { // Required for tech in titles, search in sub items const item = await game.l5r5e.HelpersL5r5e.getEmbedItemByEvent(event, this.actor); - if (!item || item.type !== "technique" || !item.data.data.skill) { + if (!item || item.type !== "technique" || !item.system.skill) { return; } - const itemData = item.data.data; + const itemData = item.system; new game.l5r5e.DicePickerDialog({ actor: this.actor, ringId: itemData.ring || null, diff --git a/system/scripts/actors/character-generator.js b/system/scripts/actors/character-generator.js index bc7283f..5269dba 100644 --- a/system/scripts/actors/character-generator.js +++ b/system/scripts/actors/character-generator.js @@ -100,7 +100,7 @@ export class CharacterGenerator { if (!comp.indexed) { await comp.getDocuments(); } - document = comp.getDocument(CharacterGenerator._getRandomArrayValue(Array.from(comp.keys()))); + document = comp.getDocument(CharacterGenerator._getRandomArrayValue(Array.from(comp.index.keys()))); } await game.l5r5e.HelpersL5r5e.refreshItemProperties(document); return document; @@ -145,7 +145,7 @@ export class CharacterGenerator { const randomNames = await game.l5r5e.HelpersL5r5e.drawManyFromPack("l5r5e.core-name-tables", table, 1, { displayChat: false, }); - return randomNames?.results[0]?.data.text || ""; + return randomNames?.results[0]?.text || ""; } /** @@ -387,8 +387,8 @@ export class CharacterGenerator { // /** * Generate attributes (rings, attributes, skills, confrontation ranks) - * @param {boolean} isNpc - * @param {DocumentData.data} actorDatas + * @param {boolean} isNpc + * @param {DocumentData.system} actorDatas * @private */ _generateAttributes(isNpc, actorDatas) { @@ -425,7 +425,7 @@ export class CharacterGenerator { /** * Generate Demeanor (npc only) - * @param {DocumentData.data} actorDatas + * @param {DocumentData.system} actorDatas * @private */ _generateDemeanor(actorDatas) { @@ -462,7 +462,7 @@ export class CharacterGenerator { for (const pack of ["adversities", "distinctions", "passions", "anxieties"]) { const item = await CharacterGenerator._getItemFromPack(`l5r5e.core-peculiarities-${pack}`); if (item) { - newItemsData.push(foundry.utils.duplicate(item.data)); + newItemsData.push(foundry.utils.duplicate(item)); } } } @@ -506,7 +506,7 @@ export class CharacterGenerator { for (const itemId of itemCfg[pack]) { const item = await CharacterGenerator._getItemFromPack(`l5r5e.core-${pack}`, itemId); if (item) { - newItemsData.push(foundry.utils.duplicate(item.data)); + newItemsData.push(foundry.utils.duplicate(item)); } } } @@ -616,8 +616,7 @@ export class CharacterGenerator { } while (item && item.system.rank > avgrv); if (item) { - console.log(item); //todo tmp check this! - newItemsData.push(foundry.utils.duplicate(item.data)); + newItemsData.push(foundry.utils.duplicate(item)); } } // fr qty } // fr techCfg @@ -625,7 +624,7 @@ export class CharacterGenerator { /** * Fill notes with some values that don't appear in sheet - * @param {DocumentData.data} actorDatas + * @param {DocumentData.system} actorDatas * @return {Promise} * @private */ @@ -671,7 +670,7 @@ export class CharacterGenerator { /** * Generate Narrative fluff - * @param {DocumentData.data} actorDatas + * @param {DocumentData.system} actorDatas * @private */ _generateNarrative(actorDatas) { diff --git a/system/scripts/dice/dice-picker-dialog.js b/system/scripts/dice/dice-picker-dialog.js index 259ffb3..07c82c2 100644 --- a/system/scripts/dice/dice-picker-dialog.js +++ b/system/scripts/dice/dice-picker-dialog.js @@ -190,7 +190,7 @@ export class DicePickerDialog extends FormApplication { set targetInfos(targetToken) { this.object.targetInfos = targetToken ? { - img: targetToken.img, + img: targetToken.texture.src || null, name: targetToken.name, } : null; diff --git a/system/scripts/dice/roll-n-keep-dialog.js b/system/scripts/dice/roll-n-keep-dialog.js index d57cf21..610b198 100644 --- a/system/scripts/dice/roll-n-keep-dialog.js +++ b/system/scripts/dice/roll-n-keep-dialog.js @@ -548,8 +548,8 @@ export class RollnKeepDialog extends FormApplication { roll, game.user, true, - this._message.data.whisper.length === 0 ? null : this._message.data.whisper, - this._message.data.blind + this._message.whisper.length === 0 ? null : this._message.whisper, + this._message.blind ); } @@ -657,7 +657,7 @@ export class RollnKeepDialog extends FormApplication { if (this.roll.l5r5e.isInitiativeRoll) { let msgOptions = { rnkRoll: this.roll, - rollMode: game.l5r5e.HelpersL5r5e.getRollMode(this._message.data), + rollMode: game.l5r5e.HelpersL5r5e.getRollMode(this._message), }; await this.roll.l5r5e.actor.rollInitiative({ @@ -673,7 +673,7 @@ export class RollnKeepDialog extends FormApplication { // Send it to chat, switch to new message this.message = await this.roll.toMessage( {}, - { rollMode: game.l5r5e.HelpersL5r5e.getRollMode(this._message.data) } + { rollMode: game.l5r5e.HelpersL5r5e.getRollMode(this._message) } ); } diff --git a/system/scripts/dice/roll.js b/system/scripts/dice/roll.js index b7b165f..5c4f58d 100644 --- a/system/scripts/dice/roll.js +++ b/system/scripts/dice/roll.js @@ -74,7 +74,7 @@ export class RollL5r5e extends Roll { set targetInfos(targetToken) { this.l5r5e.targetInfos = targetToken ? { - img: targetToken.img, + img: targetToken.texture.src || null, name: targetToken.name, } : null; @@ -287,8 +287,7 @@ export class RollL5r5e extends Roll { isPublicRoll: !isPrivate, tooltip: isPrivate ? "" : await this.getTooltip({ from: "render" }), total: isPrivate ? "?" : this.total, - //data: this.data, - profileImg: this.l5r5e.actor?.img ? this.l5r5e.actor?.img : "icons/svg/mystery-man.svg", + profileImg: this.l5r5e.actor?.img || "icons/svg/mystery-man.svg", l5r5e: isPrivate ? {} : { diff --git a/system/scripts/helpers.js b/system/scripts/helpers.js index 63b6630..c418af0 100644 --- a/system/scripts/helpers.js +++ b/system/scripts/helpers.js @@ -129,7 +129,7 @@ export class HelpersL5r5e { * @param {string} uuid "Item.5qI6SU85VSFqji8W" * @param {string} id "5qI6SU85VSFqji8W" * @param {string} type Type ("Item", "JournalEntry"...) - * @param {any[]|null} data Plain data + * @param {any[]|null} data Plain document data * @param {string|null} pack Pack name * @param {string|null} parentId Used to avoid an infinite loop in properties if set * @return {Promise} diff --git a/system/templates/actors/actor-export.html b/system/templates/actors/actor-export.html index 1c98d44..377ad82 100644 --- a/system/templates/actors/actor-export.html +++ b/system/templates/actors/actor-export.html @@ -10,45 +10,45 @@ {{!-- Sheet Header --}}
    {{!-- Identity --}} -
  • {{#ifCond data.data.template '==' 'pow'}}{{localize 'l5r5e.sheets.region'}}{{else}}{{localize 'l5r5e.clans.label'}}{{/ifCond}} : {{data.data.identity.clan}}
    • -
  • {{#ifCond data.data.template '==' 'pow'}}{{localize 'l5r5e.sheets.upbringing'}}{{else}}{{localize 'l5r5e.sheets.family'}}{{/ifCond}} : {{data.data.identity.family}}
    • -
  • {{localize 'l5r5e.sheets.rank'}} : {{data.data.identity.school_rank}}
    • -
  • {{localize 'l5r5e.sheets.school'}} : {{data.data.identity.school}}
    • -
  • {{localize 'l5r5e.roles'}} : {{data.data.identity.roles}}
    • +
  • {{#ifCond data.system.template '==' 'pow'}}{{localize 'l5r5e.sheets.region'}}{{else}}{{localize 'l5r5e.clans.label'}}{{/ifCond}} : {{data.system.identity.clan}}
    • +
  • {{#ifCond data.system.template '==' 'pow'}}{{localize 'l5r5e.sheets.upbringing'}}{{else}}{{localize 'l5r5e.sheets.family'}}{{/ifCond}} : {{data.system.identity.family}}
    • +
  • {{localize 'l5r5e.sheets.rank'}} : {{data.system.identity.school_rank}}
    • +
  • {{localize 'l5r5e.sheets.school'}} : {{data.system.identity.school}}
    • +
  • {{localize 'l5r5e.roles'}} : {{data.system.identity.roles}}
    • {{!-- Social --}} -
  • {{localize 'l5r5e.social.honor'}} : {{data.data.social.honor}}
    • -
  • {{localize 'l5r5e.social.glory'}} : {{data.data.social.glory}}
    • -
  • {{localize 'l5r5e.social.status'}} : {{data.data.social.status}}
    • +
  • {{localize 'l5r5e.social.honor'}} : {{data.system.social.honor}}
    • +
  • {{localize 'l5r5e.social.glory'}} : {{data.system.social.glory}}
    • +
  • {{localize 'l5r5e.social.status'}} : {{data.system.social.status}}
    • {{!-- Rings --}} -
  • {{localize 'l5r5e.rings.earth'}} : {{data.data.rings.earth}}
    • -
  • {{localize 'l5r5e.rings.air'}} : {{data.data.rings.air}}
    • -
  • {{localize 'l5r5e.rings.water'}} : {{data.data.rings.water}}
    • -
  • {{localize 'l5r5e.rings.fire'}} : {{data.data.rings.fire}}
    • -
  • {{localize 'l5r5e.rings.void'}} : {{data.data.rings.void}}
    • +
  • {{localize 'l5r5e.rings.earth'}} : {{data.system.rings.earth}}
    • +
  • {{localize 'l5r5e.rings.air'}} : {{data.system.rings.air}}
    • +
  • {{localize 'l5r5e.rings.water'}} : {{data.system.rings.water}}
    • +
  • {{localize 'l5r5e.rings.fire'}} : {{data.system.rings.fire}}
    • +
  • {{localize 'l5r5e.rings.void'}} : {{data.system.rings.void}}
    • {{!-- Attributes --}} -
  • {{localize 'l5r5e.attributes.endurance'}} : {{data.data.endurance}}
    • -
  • {{localize 'l5r5e.attributes.composure'}} : {{data.data.composure}}
    • -
  • {{localize 'l5r5e.attributes.focus'}} : {{data.data.focus}}
    • -
  • {{localize 'l5r5e.attributes.vigilance'}} : {{data.data.vigilance}}
    • -
  • {{localize 'l5r5e.attributes.voidpoints'}} : {{data.data.void_points.max}}
    • +
  • {{localize 'l5r5e.attributes.endurance'}} : {{data.system.endurance}}
    • +
  • {{localize 'l5r5e.attributes.composure'}} : {{data.system.composure}}
    • +
  • {{localize 'l5r5e.attributes.focus'}} : {{data.system.focus}}
    • +
  • {{localize 'l5r5e.attributes.vigilance'}} : {{data.system.vigilance}}
    • +
  • {{localize 'l5r5e.attributes.voidpoints'}} : {{data.system.void_points.max}}
    • {{!-- Narrative : Social --}} -
  • {{localize 'l5r5e.social.ninjo'}} : {{data.data.social.ninjo}}
    • -
  • {{#ifCond data.data.template '==' 'pow'}}{{localize 'l5r5e.social.past'}}{{else}}{{localize 'l5r5e.social.giri'}}{{/ifCond}} : {{data.data.social.giri}}
    • -
  • {{localize 'l5r5e.social.bushido_tenets.paramount'}} : {{data.data.social.bushido_tenets.paramount}}
    • -
  • {{localize 'l5r5e.social.bushido_tenets.less_significant'}} : {{data.data.social.bushido_tenets.less_significant}}
    • -
  • {{localize 'l5r5e.sheets.description' }} : {{{data.data.description}}}
    • -
  • {{localize 'l5r5e.sheets.notes' }} : {{{data.data.notes}}}
    • +
  • {{localize 'l5r5e.social.ninjo'}} : {{data.system.social.ninjo}}
    • +
  • {{#ifCond data.system.template '==' 'pow'}}{{localize 'l5r5e.social.past'}}{{else}}{{localize 'l5r5e.social.giri'}}{{/ifCond}} : {{data.system.social.giri}}
    • +
  • {{localize 'l5r5e.social.bushido_tenets.paramount'}} : {{data.system.social.bushido_tenets.paramount}}
    • +
  • {{localize 'l5r5e.social.bushido_tenets.less_significant'}} : {{data.system.social.bushido_tenets.less_significant}}
    • +
  • {{localize 'l5r5e.sheets.description' }} : {{{data.system.description}}}
    • +
  • {{localize 'l5r5e.sheets.notes' }} : {{{data.system.notes}}}
{{!-- a faire : Spé Skill/Ecoles pour les pnj --}} {{!-- Skills Tab : Skills --}}

{{localize 'l5r5e.skills.title'}}

    - {{#each data.data.skills as |category categoryId|}} + {{#each data.system.skills as |category categoryId|}}
  • {{localizeSkill categoryId 'title'}}
      @@ -85,8 +85,8 @@

      {{localize 'l5r5e.advancements.signature_scroll' }}

        {{#each actor.items as |scroll|}} - {{#ifCond scroll.data.type '==' 'signature_scroll'}} -
      • {{> 'systems/l5r5e/templates/items/signature-scroll/signature-scroll-text.html' data=scroll.data editable=../options.editable}}
        • + {{#ifCond scroll.type '==' 'signature_scroll'}} +
      • {{> 'systems/l5r5e/templates/items/signature-scroll/signature-scroll-text.html' data=scroll editable=../options.editable}}
        • {{/ifCond}} {{/each}}
      @@ -96,7 +96,7 @@

      {{localize 'l5r5e.social.advantages'}}

        {{#each data.items as |item|}} - {{#ifCond '["distinction","passion"]' 'includes' item.data.peculiarity_type}} + {{#ifCond '["distinction","passion"]' 'includes' item.system.peculiarity_type}}
      • {{> 'systems/l5r5e/templates/items/peculiarity/peculiarity-text.html' data=item editable=../options.editable}}
        • {{/ifCond}} {{/each}} @@ -106,7 +106,7 @@

        {{localize 'l5r5e.social.disadvantages'}}

          {{#each data.items as |item|}} - {{#ifCond '["adversity","anxiety"]' 'includes' item.data.peculiarity_type}} + {{#ifCond '["adversity","anxiety"]' 'includes' item.system.peculiarity_type}}
        • {{> 'systems/l5r5e/templates/items/peculiarity/peculiarity-text.html' data=item editable=../options.editable}}
          • {{/ifCond}} {{/each}} @@ -127,7 +127,7 @@ {{!-- items list --}}

          {{localize 'l5r5e.sheets.equipment'}}

            -
          • {{localize 'l5r5e.money.title'}} : {{data.data.money.koku}} {{localize 'l5r5e.money.koku'}} / {{data.data.money.bu}} {{localize 'l5r5e.money.bu'}} / {{data.data.money.zeni}} {{localize 'l5r5e.money.zeni'}}
            • +
          • {{localize 'l5r5e.money.title'}} : {{data.system.money.koku}} {{localize 'l5r5e.money.koku'}} / {{data.system.money.bu}} {{localize 'l5r5e.money.bu'}} / {{data.system.money.zeni}} {{localize 'l5r5e.money.zeni'}}
            • {{#each data.splitItemsList as |cat type|}}
          • {{localize (localize 'l5r5e.{type}s.title' type=type)}} ({{cat.length}}) @@ -144,8 +144,8 @@

            {{localize 'l5r5e.advancements.item_pattern'}}

              {{#each actor.items as |pattern|}} - {{#ifCond pattern.data.type '==' 'item_pattern'}} -
            • {{> 'systems/l5r5e/templates/items/item-pattern/item-pattern-text.html' data=pattern.data editable=../options.editable}}
              • + {{#ifCond pattern.type '==' 'item_pattern'}} +
            • {{> 'systems/l5r5e/templates/items/item-pattern/item-pattern-text.html' data=pattern editable=../options.editable}}
              • {{/ifCond}} {{/each}}
            @@ -154,13 +154,13 @@ {{!-- Experience Tab --}}

            {{localize 'l5r5e.sheets.experience'}}

              -
            • {{localize 'l5r5e.advancements.total'}} : {{data.data.xp_total}}
              • -
            • {{localize 'l5r5e.advancements.spent'}} : {{data.data.xp_spent}}
              • -
            • {{localize 'l5r5e.advancements.saved'}} : {{data.data.xp_saved}}
              • +
            • {{localize 'l5r5e.advancements.total'}} : {{data.system.xp_total}}
              • +
            • {{localize 'l5r5e.advancements.spent'}} : {{data.system.xp_spent}}
              • +
            • {{localize 'l5r5e.advancements.saved'}} : {{data.system.xp_saved}}
            {{!-- School progression --}} -

            {{#if data.data.identity.school_curriculum_journal.name}}{{data.data.identity.school_curriculum_journal.name}}{{else}}{{localize 'l5r5e.sheets.school'}}{{/if}}

            +

            {{#if data.system.identity.school_curriculum_journal.name}}{{data.system.identity.school_curriculum_journal.name}}{{else}}{{localize 'l5r5e.sheets.school'}}{{/if}}

            @@ -173,9 +173,9 @@ {{#each rankObject.list as |advancement|}} - - - + + + {{/each}} {{/each}} @@ -193,8 +193,8 @@ {{#each data.advancementsOthers as |advancement|}} - - + + {{/each}}
            {{localize 'l5r5e.sheets.name'}}
            {{advancement.name}}{{#if advancement.data.in_curriculum}}✓{{/if}}{{advancement.data.xp_used}}{{advancement.data.rank}}{{#if advancement.system.in_curriculum}}✓{{/if}}{{advancement.system.xp_used}}{{advancement.system.rank}}
            {{advancement.name}}{{advancement.data.xp_used}}{{advancement.data.rank}}{{advancement.system.xp_used}}{{advancement.system.rank}}
            @@ -202,27 +202,27 @@ {{!-- 20Q --}} - {{#ifCond data.data.twenty_questions.template '==' 'pow'}} + {{#ifCond data.system.twenty_questions.template '==' 'pow'}} {{setVar "suffix" "pow"}} {{else}} {{setVar "suffix" ""}} {{/ifCond}}

            {{localize 'l5r5e.twenty_questions.title'}}

              -
            • {{localize (localize 'l5r5e.twenty_questions.part2.q4{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step4.stand_out}}
              • -
            • {{localize (localize 'l5r5e.twenty_questions.part3.q7{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step7.clan_relations}}
              • -
            • {{localize (localize 'l5r5e.twenty_questions.part3.q8{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step8.bushido}}
              • -
            • {{localize (localize 'l5r5e.twenty_questions.part4.q9{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step9.success}}
              • -
            • {{localize (localize 'l5r5e.twenty_questions.part4.q10{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step10.difficulty}}
              • -
            • {{localize (localize 'l5r5e.twenty_questions.part4.q11{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step11.calms}}
              • -
            • {{localize (localize 'l5r5e.twenty_questions.part4.q12{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step12.worries}}
              • -
            • {{localize (localize 'l5r5e.twenty_questions.part4.q13{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step13.most_learn}}
              • -
            • {{localize (localize 'l5r5e.twenty_questions.part5.q14{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step14.first_sight}}
              • -
            • {{localize (localize 'l5r5e.twenty_questions.part5.q15{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step15.stress}}
              • -
            • {{localize (localize 'l5r5e.twenty_questions.part5.q16{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step16.relations}}
              • -
            • {{localize (localize 'l5r5e.twenty_questions.part6.q17{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step17.parents_pov}}
              • -
            • {{localize (localize 'l5r5e.twenty_questions.part6.q18{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step18.heritage_name}}
              • -
            • {{localize (localize 'l5r5e.twenty_questions.part7.q20{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step20.death}}
              • +
            • {{localize (localize 'l5r5e.twenty_questions.part2.q4{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step4.stand_out}}
              • +
            • {{localize (localize 'l5r5e.twenty_questions.part3.q7{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step7.clan_relations}}
              • +
            • {{localize (localize 'l5r5e.twenty_questions.part3.q8{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step8.bushido}}
              • +
            • {{localize (localize 'l5r5e.twenty_questions.part4.q9{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step9.success}}
              • +
            • {{localize (localize 'l5r5e.twenty_questions.part4.q10{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step10.difficulty}}
              • +
            • {{localize (localize 'l5r5e.twenty_questions.part4.q11{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step11.calms}}
              • +
            • {{localize (localize 'l5r5e.twenty_questions.part4.q12{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step12.worries}}
              • +
            • {{localize (localize 'l5r5e.twenty_questions.part4.q13{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step13.most_learn}}
              • +
            • {{localize (localize 'l5r5e.twenty_questions.part5.q14{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step14.first_sight}}
              • +
            • {{localize (localize 'l5r5e.twenty_questions.part5.q15{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step15.stress}}
              • +
            • {{localize (localize 'l5r5e.twenty_questions.part5.q16{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step16.relations}}
              • +
            • {{localize (localize 'l5r5e.twenty_questions.part6.q17{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step17.parents_pov}}
              • +
            • {{localize (localize 'l5r5e.twenty_questions.part6.q18{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step18.heritage_name}}
              • +
            • {{localize (localize 'l5r5e.twenty_questions.part7.q20{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step20.death}}
            diff --git a/system/templates/actors/army/army.html b/system/templates/actors/army/army.html index e463566..bcf5946 100644 --- a/system/templates/actors/army/army.html +++ b/system/templates/actors/army/army.html @@ -35,7 +35,7 @@ {{/if}} {{else}} - + {{/if}}