v1.5 #542

Merged
uberwald merged 3 commits from VincentVk/foundryvtt-reve-de-dragon:v1.5 into v1.5 2022-07-17 11:04:20 +02:00
3 changed files with 22 additions and 24 deletions

View File

@ -115,11 +115,14 @@ export class RdDActor extends Actor {
return actor; return actor;
} }
if (isPersonnage) {
const competences = await RdDUtility.loadCompendium(RdDItemCompetence.actorCompendium(actorData.type)); const competences = await RdDUtility.loadCompendium(RdDItemCompetence.actorCompendium(actorData.type));
actorData.items = competences.map(i => i.toObject()); actorData.items = competences.map(i => i.toObject());
if (isPersonnage) {
actorData.items = actorData.items.concat(Monnaie.monnaiesData()); actorData.items = actorData.items.concat(Monnaie.monnaiesData());
} }
else {
actorData.items = [];
}
return super.create(actorData, options); return super.create(actorData, options);
} }

File diff suppressed because one or more lines are too long

View File

@ -89,9 +89,7 @@
{{!-- Compétences Tab --}} {{!-- Compétences Tab --}}
<div class="tab competences" data-group="primary" data-tab="competences"> <div class="tab competences" data-group="primary" data-tab="competences">
<div class="flexcol"> <div class="flexcol">
<div class="flex-group-left flexcol competence-column"> <div class="flex-group-left flexcol competence-column">
<ol class="item-list alterne-list"> <ol class="item-list alterne-list">
{{#each competences as |comp key|}} {{#each competences as |comp key|}}
@ -111,7 +109,7 @@
</li> </li>
{{/each}} {{/each}}
</ol> </ol>
</div>
<div class="flex-group-left flexcol competence-column"> <div class="flex-group-left flexcol competence-column">
<ol class="item-list alterne-list"> <ol class="item-list alterne-list">
{{#each possessions as |possession key|}} {{#each possessions as |possession key|}}
@ -125,7 +123,6 @@
</li> </li>
{{/each}} {{/each}}
</ol> </ol>
</div> </div>
</div> </div>
</div> </div>
@ -138,7 +135,5 @@
{{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}}
</div> </div>
</div>
</section> </section>
</form> </form>