VincentVk/foundryvtt-reve-de-dragon
0
0
Fork 0
forked from public/foundryvtt-reve-de-dragon
Code Issues Pull Requests Projects Releases Wiki Activity

Fix: suppression conquête automatique

Browse Source
This commit is contained in:
Vincent Vandemeulebrouck 2021-06-05 01:53:30 +02:00
parent 7ba3b44c87
commit 9a7b01a985
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/actor.js
View File

@ -4079,7 +4079,7 @@ export class RdDActor extends Actor {
if (Misc.isElectedUser()) { if (Misc.isElectedUser()) {
let draconique = Draconique.all().find(it => it.isCase(item)); let draconique = Draconique.all().find(it => it.isCase(item));
if (draconique) { if (draconique) {
draconique.onActorDeleteCaseTmr(this, item) draconique.onActorDeleteCaseTmr(this, Misc.data(item))
} }
} }
} }

2
module/tmr/conquete.js
View File

@ -32,7 +32,7 @@ export class Conquete extends Draconique {
async _creerConquete(actor, queue) { async _creerConquete(actor, queue) {
let existants = actor.data.items.filter(it => this.isCase(it)).map(it => Misc.data(it).data.coord); let existants = actor.data.items.filter(it => this.isCase(it)).map(it => Misc.data(it).data.coord);
let possibles = TMRUtility.filterTMR(tmr => !TMRUtility.isCaseHumide(tmr) && !existants.includes(tmr.coord)); let possibles = TMRUtility.filterTMR(tmr => !TMRUtility.isCaseHumide(tmr) && !existants.includes(tmr.coord));
let conquete =await RdDDice.rollOneOf(possibles); let conquete = await RdDDice.rollOneOf(possibles);
await this.createCaseTmr(actor, 'Conquête: ' + conquete.label, conquete, queue.id); await this.createCaseTmr(actor, 'Conquête: ' + conquete.label, conquete, queue.id);
} }

15
templates/actor-sheet.html
View File

@ -437,11 +437,11 @@
{{data.reve.refoulement.value}} {{data.reve.refoulement.value}}
{{/if}} {{/if}}
</span> </span>
</li> </li>
</ul> </ul>
</div> </div>
<hr> <hr>
{{#if data.attributs.hautrevant.value}} {{#if data.attributs.hautrevant.value}}
{{#if options.isGM}} {{#if options.isGM}}
<h3>Signes draconiques</h3> <h3>Signes draconiques</h3>
<ul class="item-list alterne-list"> <ul class="item-list alterne-list">
@ -567,12 +567,13 @@
{{#each hautreve.casesTmr as |casetmr key|}} {{#each hautreve.casesTmr as |casetmr key|}}
<li class="item flexrow" data-item-id="{{casetmr._id}}" data-attribute="{{key}}"> <li class="item flexrow" data-item-id="{{casetmr._id}}" data-attribute="{{key}}">
<span class="display-label"><a data-item-id="{{casetmr._id}}">{{casetmr.name}}</a></span> <span class="display-label"><a data-item-id="{{casetmr._id}}">{{casetmr.name}}</a></span>
<span class="item-controls flex-shrink"> <div class="item-controls flex-shrink">
<a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a> <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
</span> </div>
</li> </li>
{{/each}} {{/each}}
</ul> </ul>
<br><br>
{{/if}} {{/if}}
</div> </div>