GM Monitor : Cohorts & fortification list in general tooltip

This commit is contained in:
Vlyan
2021-12-06 11:11:45 +01:00
parent eb36ce67ae
commit f6cc3015cb
6 changed files with 41 additions and 17 deletions

View File

@@ -388,7 +388,7 @@
"past_battles": "Past Battles",
"cohort": {
"tab": "Cohorts",
"title": "Cohorts",
"title": "Cohort",
"leader": "Leader",
"abilities": "Abilities"
},

View File

@@ -388,7 +388,7 @@
"past_battles": "Past Battles",
"cohort": {
"tab": "Cohorts",
"title": "Cohorts",
"title": "Cohort",
"leader": "Leader",
"abilities": "Abilities"
},

View File

@@ -394,7 +394,7 @@
},
"fortification": {
"tab": "Fortifications",
"title": "Fortifications",
"title": "Fortification",
"difficulty": "Difficulté",
"attrition_reduction": "Usure"
}

View File

@@ -277,11 +277,11 @@ export class GmMonitor extends FormApplication {
* @private
*/
async _getTooltipArmiesGlobal(actor) {
const data = actor.data.data;
const actorData = (await actor.sheet?.getData()) || actor.data;
// *** Template ***
return renderTemplate(`${CONFIG.l5r5e.paths.templates}gm/monitor-tooltips/global-armies.html`, {
actorData: data,
actorData: actorData.data,
});
}

View File

@@ -31,8 +31,8 @@
{{!-- Sheet Tab Navigation --}}
<nav class="sheet-tabs tabs" data-group="primary">
<a class="item" data-tab="army">{{localize 'ACTOR.TypeArmy'}}</a>
<a class="item" data-tab="cohort">{{localize 'l5r5e.army.cohort.title'}}</a>
<a class="item" data-tab="fortification">{{localize 'l5r5e.army.fortification.title'}}</a>
<a class="item" data-tab="cohort">{{localize 'l5r5e.army.cohort.tab'}}</a>
<a class="item" data-tab="fortification">{{localize 'l5r5e.army.fortification.tab'}}</a>
<a class="item" data-tab="others">{{localize 'l5r5e.notes'}}</a>
</nav>

View File

@@ -1,21 +1,45 @@
<section>
<h2>{{localize 'ACTOR.TypeArmy'}}</h2>
<ul>
{{!-- warlord --}}
<li><b>{{localize 'l5r5e.army.allies_backers'}}</b> : {{actorData.allies_backers}}</li>
<li><b>{{localize 'l5r5e.army.purpose_mustering'}}</b> : {{actorData.purpose_mustering}}</li>
<li><b>{{localize 'l5r5e.army.allies_backers'}}</b> : {{actorData.data.allies_backers}}</li>
<li><b>{{localize 'l5r5e.army.purpose_mustering'}}</b> : {{actorData.data.purpose_mustering}}</li>
{{!-- commander --}}
<li><b>{{localize 'l5r5e.army.commander_abilities'}}</b> : {{actorData.commander_abilities}}</li>
<li><b>{{localize 'l5r5e.army.army_abilities'}}</b> : {{actorData.army_abilities}}</li>
<li><b>{{localize 'l5r5e.army.commander_abilities'}}</b> : {{actorData.data.commander_abilities}}</li>
<li><b>{{localize 'l5r5e.army.army_abilities'}}</b> : {{actorData.data.army_abilities}}</li>
</ul>
<p>{{{actorData.description}}}</p>
{{!-- description --}}
<p>{{{actorData.data.description}}}</p>
{{json actorData.items}}
{{localize 'l5r5e.army.cohort.title'}}
{{!-- Cohorts --}}
{{#if actorData.splitItemsList.army_cohort}}
<h2>{{localize 'l5r5e.army.cohort.tab'}}</h2>
<ul>
{{#each data.splitItemsList.army_cohort as |item|}}
<li><b>{{localize 'l5r5e.army.allies_backers'}}</b> : {{actorData.allies_backers}}</li>
{{#each actorData.splitItemsList.army_cohort as |cohort|}}
<li>
<b>{{cohort.name}} {{#if cohort.data.leader}}({{cohort.data.leader}}){{/if}}</b>
<br>
<i class="fas fa-user-injured" title="{{localize 'l5r5e.army.battle_readiness.casualties'}}"> {{cohort.data.battle_readiness.casualties_strength.value}}</i>
<i class="fas fa-fist-raised" title="{{localize 'l5r5e.army.battle_readiness.strength'}}"> {{cohort.data.battle_readiness.casualties_strength.max}}</i>
<i class="fas fa-ghost" title="{{localize 'l5r5e.army.battle_readiness.panic'}}"> {{cohort.data.battle_readiness.panic_discipline.value}}</i>
<i class="fas fa-user-friends" title="{{localize 'l5r5e.army.battle_readiness.discipline'}}"> {{cohort.data.battle_readiness.panic_discipline.max}}</i>
</li>
{{/each}}
</ul>
{{/if}}
{{!-- Fortifications --}}
{{#if actorData.splitItemsList.army_fortification}}
<h2>{{localize 'l5r5e.army.fortification.tab'}}</h2>
<ul>
{{#each actorData.splitItemsList.army_fortification as |fortification|}}
<li>
<b>{{fortification.name}}</b>
<i class="fas fa-skull" title="{{localize 'l5r5e.army.fortification.difficulty'}}"> {{fortification.data.difficulty}}</i>
<i class="fas fa-dungeon" title="{{localize 'l5r5e.army.fortification.attrition_reduction'}}"> {{fortification.data.attrition_reduction}}</i>
</li>
{{/each}}
</ul>
{{/if}}
</section>