Working on Compatibility for FVTT v10

token.img -> token.texture.src
some missing data/system
comp.keys() -> comp.index.keys()
This commit is contained in:
Vlyan
2022-07-22 12:43:48 +02:00
parent 894cdba28b
commit b92d2b3112
8 changed files with 86 additions and 91 deletions

View File

@@ -10,45 +10,45 @@
{{!-- Sheet Header --}}
<ul>
{{!-- Identity --}}
<li>{{#ifCond data.data.template '==' 'pow'}}{{localize 'l5r5e.sheets.region'}}{{else}}{{localize 'l5r5e.clans.label'}}{{/ifCond}} : {{data.data.identity.clan}}</li>
<li>{{#ifCond data.data.template '==' 'pow'}}{{localize 'l5r5e.sheets.upbringing'}}{{else}}{{localize 'l5r5e.sheets.family'}}{{/ifCond}} : {{data.data.identity.family}}</li>
<li>{{localize 'l5r5e.sheets.rank'}} : {{data.data.identity.school_rank}}</li>
<li>{{localize 'l5r5e.sheets.school'}} : {{data.data.identity.school}}</li>
<li>{{localize 'l5r5e.roles'}} : {{data.data.identity.roles}}</li>
<li>{{#ifCond data.system.template '==' 'pow'}}{{localize 'l5r5e.sheets.region'}}{{else}}{{localize 'l5r5e.clans.label'}}{{/ifCond}} : {{data.system.identity.clan}}</li>
<li>{{#ifCond data.system.template '==' 'pow'}}{{localize 'l5r5e.sheets.upbringing'}}{{else}}{{localize 'l5r5e.sheets.family'}}{{/ifCond}} : {{data.system.identity.family}}</li>
<li>{{localize 'l5r5e.sheets.rank'}} : {{data.system.identity.school_rank}}</li>
<li>{{localize 'l5r5e.sheets.school'}} : {{data.system.identity.school}}</li>
<li>{{localize 'l5r5e.roles'}} : {{data.system.identity.roles}}</li>
{{!-- Social --}}
<li>{{localize 'l5r5e.social.honor'}} : {{data.data.social.honor}}</li>
<li>{{localize 'l5r5e.social.glory'}} : {{data.data.social.glory}}</li>
<li>{{localize 'l5r5e.social.status'}} : {{data.data.social.status}}</li>
<li>{{localize 'l5r5e.social.honor'}} : {{data.system.social.honor}}</li>
<li>{{localize 'l5r5e.social.glory'}} : {{data.system.social.glory}}</li>
<li>{{localize 'l5r5e.social.status'}} : {{data.system.social.status}}</li>
{{!-- Rings --}}
<li>{{localize 'l5r5e.rings.earth'}} : {{data.data.rings.earth}}</li>
<li>{{localize 'l5r5e.rings.air'}} : {{data.data.rings.air}}</li>
<li>{{localize 'l5r5e.rings.water'}} : {{data.data.rings.water}}</li>
<li>{{localize 'l5r5e.rings.fire'}} : {{data.data.rings.fire}}</li>
<li>{{localize 'l5r5e.rings.void'}} : {{data.data.rings.void}}</li>
<li>{{localize 'l5r5e.rings.earth'}} : {{data.system.rings.earth}}</li>
<li>{{localize 'l5r5e.rings.air'}} : {{data.system.rings.air}}</li>
<li>{{localize 'l5r5e.rings.water'}} : {{data.system.rings.water}}</li>
<li>{{localize 'l5r5e.rings.fire'}} : {{data.system.rings.fire}}</li>
<li>{{localize 'l5r5e.rings.void'}} : {{data.system.rings.void}}</li>
{{!-- Attributes --}}
<li>{{localize 'l5r5e.attributes.endurance'}} : {{data.data.endurance}}</li>
<li>{{localize 'l5r5e.attributes.composure'}} : {{data.data.composure}}</li>
<li>{{localize 'l5r5e.attributes.focus'}} : {{data.data.focus}}</li>
<li>{{localize 'l5r5e.attributes.vigilance'}} : {{data.data.vigilance}}</li>
<li>{{localize 'l5r5e.attributes.voidpoints'}} : {{data.data.void_points.max}}</li>
<li>{{localize 'l5r5e.attributes.endurance'}} : {{data.system.endurance}}</li>
<li>{{localize 'l5r5e.attributes.composure'}} : {{data.system.composure}}</li>
<li>{{localize 'l5r5e.attributes.focus'}} : {{data.system.focus}}</li>
<li>{{localize 'l5r5e.attributes.vigilance'}} : {{data.system.vigilance}}</li>
<li>{{localize 'l5r5e.attributes.voidpoints'}} : {{data.system.void_points.max}}</li>
{{!-- Narrative : Social --}}
<li>{{localize 'l5r5e.social.ninjo'}} : {{data.data.social.ninjo}}</li>
<li>{{#ifCond data.data.template '==' 'pow'}}{{localize 'l5r5e.social.past'}}{{else}}{{localize 'l5r5e.social.giri'}}{{/ifCond}} : {{data.data.social.giri}}</li>
<li>{{localize 'l5r5e.social.bushido_tenets.paramount'}} : {{data.data.social.bushido_tenets.paramount}}</li>
<li>{{localize 'l5r5e.social.bushido_tenets.less_significant'}} : {{data.data.social.bushido_tenets.less_significant}}</li>
<li>{{localize 'l5r5e.sheets.description' }} : {{{data.data.description}}}</li>
<li>{{localize 'l5r5e.sheets.notes' }} : {{{data.data.notes}}}</li>
<li>{{localize 'l5r5e.social.ninjo'}} : {{data.system.social.ninjo}}</li>
<li>{{#ifCond data.system.template '==' 'pow'}}{{localize 'l5r5e.social.past'}}{{else}}{{localize 'l5r5e.social.giri'}}{{/ifCond}} : {{data.system.social.giri}}</li>
<li>{{localize 'l5r5e.social.bushido_tenets.paramount'}} : {{data.system.social.bushido_tenets.paramount}}</li>
<li>{{localize 'l5r5e.social.bushido_tenets.less_significant'}} : {{data.system.social.bushido_tenets.less_significant}}</li>
<li>{{localize 'l5r5e.sheets.description' }} : {{{data.system.description}}}</li>
<li>{{localize 'l5r5e.sheets.notes' }} : {{{data.system.notes}}}</li>
</ul>
{{!-- a faire : Spé Skill/Ecoles pour les pnj --}}
{{!-- Skills Tab : Skills --}}
<h2>{{localize 'l5r5e.skills.title'}}</h2>
<ul>
{{#each data.data.skills as |category categoryId|}}
{{#each data.system.skills as |category categoryId|}}
<li>
<strong>{{localizeSkill categoryId 'title'}}</strong>
<ul>
@@ -85,8 +85,8 @@
<h2>{{localize 'l5r5e.advancements.signature_scroll' }}</h2>
<ul>
{{#each actor.items as |scroll|}}
{{#ifCond scroll.data.type '==' 'signature_scroll'}}
<li>{{> 'systems/l5r5e/templates/items/signature-scroll/signature-scroll-text.html' data=scroll.data editable=../options.editable}}</li>
{{#ifCond scroll.type '==' 'signature_scroll'}}
<li>{{> 'systems/l5r5e/templates/items/signature-scroll/signature-scroll-text.html' data=scroll editable=../options.editable}}</li>
{{/ifCond}}
{{/each}}
</ul>
@@ -96,7 +96,7 @@
<h2>{{localize 'l5r5e.social.advantages'}}</h2>
<ul>
{{#each data.items as |item|}}
{{#ifCond '["distinction","passion"]' 'includes' item.data.peculiarity_type}}
{{#ifCond '["distinction","passion"]' 'includes' item.system.peculiarity_type}}
<li>{{> 'systems/l5r5e/templates/items/peculiarity/peculiarity-text.html' data=item editable=../options.editable}}</li>
{{/ifCond}}
{{/each}}
@@ -106,7 +106,7 @@
<h2>{{localize 'l5r5e.social.disadvantages'}}</h2>
<ul>
{{#each data.items as |item|}}
{{#ifCond '["adversity","anxiety"]' 'includes' item.data.peculiarity_type}}
{{#ifCond '["adversity","anxiety"]' 'includes' item.system.peculiarity_type}}
<li>{{> 'systems/l5r5e/templates/items/peculiarity/peculiarity-text.html' data=item editable=../options.editable}}</li>
{{/ifCond}}
{{/each}}
@@ -127,7 +127,7 @@
{{!-- items list --}}
<h2>{{localize 'l5r5e.sheets.equipment'}}</h2>
<ul>
<li>{{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'}}</li>
<li>{{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'}}</li>
{{#each data.splitItemsList as |cat type|}}
<li>
<strong>{{localize (localize 'l5r5e.{type}s.title' type=type)}} ({{cat.length}})</strong>
@@ -144,8 +144,8 @@
<h2>{{localize 'l5r5e.advancements.item_pattern'}}</h2>
<ul>
{{#each actor.items as |pattern|}}
{{#ifCond pattern.data.type '==' 'item_pattern'}}
<li>{{> 'systems/l5r5e/templates/items/item-pattern/item-pattern-text.html' data=pattern.data editable=../options.editable}}</li>
{{#ifCond pattern.type '==' 'item_pattern'}}
<li>{{> 'systems/l5r5e/templates/items/item-pattern/item-pattern-text.html' data=pattern editable=../options.editable}}</li>
{{/ifCond}}
{{/each}}
</ul>
@@ -154,13 +154,13 @@
{{!-- Experience Tab --}}
<h2>{{localize 'l5r5e.sheets.experience'}}</h2>
<ul>
<li>{{localize 'l5r5e.advancements.total'}} : {{data.data.xp_total}}</li>
<li>{{localize 'l5r5e.advancements.spent'}} : {{data.data.xp_spent}}</li>
<li>{{localize 'l5r5e.advancements.saved'}} : {{data.data.xp_saved}}</li>
<li>{{localize 'l5r5e.advancements.total'}} : {{data.system.xp_total}}</li>
<li>{{localize 'l5r5e.advancements.spent'}} : {{data.system.xp_spent}}</li>
<li>{{localize 'l5r5e.advancements.saved'}} : {{data.system.xp_saved}}</li>
</ul>
{{!-- School progression --}}
<h2>{{#if data.data.identity.school_curriculum_journal.name}}{{data.data.identity.school_curriculum_journal.name}}{{else}}{{localize 'l5r5e.sheets.school'}}{{/if}}</h2>
<h2>{{#if data.system.identity.school_curriculum_journal.name}}{{data.system.identity.school_curriculum_journal.name}}{{else}}{{localize 'l5r5e.sheets.school'}}{{/if}}</h2>
<table>
<tr>
<th>{{localize 'l5r5e.sheets.name'}}</th>
@@ -173,9 +173,9 @@
{{#each rankObject.list as |advancement|}}
<tr>
<td>{{advancement.name}}</td>
<td>{{#if advancement.data.in_curriculum}}✓</i>{{/if}}</td>
<td>{{advancement.data.xp_used}}</td>
<td>{{advancement.data.rank}}</td>
<td>{{#if advancement.system.in_curriculum}}✓</i>{{/if}}</td>
<td>{{advancement.system.xp_used}}</td>
<td>{{advancement.system.rank}}</td>
</tr>
{{/each}}
{{/each}}
@@ -193,8 +193,8 @@
{{#each data.advancementsOthers as |advancement|}}
<tr>
<td>{{advancement.name}}</td>
<td>{{advancement.data.xp_used}}</td>
<td>{{advancement.data.rank}}</td>
<td>{{advancement.system.xp_used}}</td>
<td>{{advancement.system.rank}}</td>
</tr>
{{/each}}
</table>
@@ -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}}
<h2>{{localize 'l5r5e.twenty_questions.title'}}</h2>
<ul>
<li>{{localize (localize 'l5r5e.twenty_questions.part2.q4{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step4.stand_out}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part3.q7{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step7.clan_relations}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part3.q8{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step8.bushido}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part4.q9{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step9.success}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part4.q10{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step10.difficulty}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part4.q11{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step11.calms}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part4.q12{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step12.worries}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part4.q13{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step13.most_learn}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part5.q14{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step14.first_sight}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part5.q15{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step15.stress}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part5.q16{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step16.relations}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part6.q17{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step17.parents_pov}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part6.q18{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step18.heritage_name}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part7.q20{suffix}' suffix=suffix)}} : {{data.data.twenty_questions.step20.death}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part2.q4{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step4.stand_out}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part3.q7{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step7.clan_relations}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part3.q8{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step8.bushido}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part4.q9{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step9.success}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part4.q10{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step10.difficulty}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part4.q11{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step11.calms}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part4.q12{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step12.worries}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part4.q13{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step13.most_learn}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part5.q14{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step14.first_sight}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part5.q15{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step15.stress}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part5.q16{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step16.relations}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part6.q17{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step17.parents_pov}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part6.q18{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step18.heritage_name}}</li>
<li>{{localize (localize 'l5r5e.twenty_questions.part7.q20{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step20.death}}</li>
</ul>
</section>

View File

@@ -35,7 +35,7 @@
{{/if}}
</label>
{{else}}
<input name="data.commander" type="text" value="{{data.data.commander}}" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
<input name="system.commander" type="text" value="{{data.system.commander}}" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
{{/if}}
</div>
<div class="standing">