public/foundryvtt-reve-de-dragon
1
1
Fork 1
Code Issues 4 Pull Requests Actions Projects Releases 163 Wiki Activity

Merge branch 'v1.5-fix-parade' into 'v1.5'

Browse Source 
V1.5 fix parade

See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!309
This commit is contained in:
Leratier Bretonnien 2022-01-02 21:45:42 +00:00
commit 4a1a7ceac1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
module/misc.js
View File

@ -150,7 +150,6 @@ export class Misc {
* @returns true pour un seul utilisateur: le premier GM connecté par ordre d'id * @returns true pour un seul utilisateur: le premier GM connecté par ordre d'id
*/ */
static isUniqueConnectedGM() { static isUniqueConnectedGM() {
console.log(game.user.id, Misc.firstConnectedGM()?.id)
return game.user.id == Misc.firstConnectedGM()?.id; return game.user.id == Misc.firstConnectedGM()?.id;
} }

5
module/rdd-combat.js
View File

@ -954,9 +954,10 @@ export class RdDCombat {
/* -------------------------------------------- */ /* -------------------------------------------- */
_filterArmesParade(defender, competence) { _filterArmesParade(defender, competence) {
let items = defender.data.items; let items = defender.data.items;
items = items.filter(it => RdDItemArme.isArmeUtilisable(it) || RdDItemCompetenceCreature.isCompetenceParade(it)); items = items.filter(it => RdDItemArme.isArmeUtilisable(it) || RdDItemCompetenceCreature.isCompetenceParade(it))
.map(Misc.data);
for (let item of items) { for (let item of items) {
item.data.nbUsage = defender.getItemUse(item.id); // Ajout du # d'utilisation ce round item.data.nbUsage = defender.getItemUse(item._id); // Ajout du # d'utilisation ce round
} }
switch (competence.data.categorie) { switch (competence.data.categorie) {
case 'tir': case 'tir':