From 52e1f9dfbffaf1b534a85df852608e4bd717275b Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Wed, 25 Sep 2024 22:56:24 +0200 Subject: [PATCH] Rename TYPES en ITEM_TYPES Pour ajouter les ACTOR_TYPES --- module/actor.js | 40 ++++----- module/actor/base-actor-reve.js | 30 ++----- module/actor/base-actor-sang.js | 10 +-- module/actor/base-actor-sheet.js | 4 +- module/actor/base-actor.js | 4 +- module/actor/creature.js | 4 +- module/actor/entite.js | 6 +- module/item-arme.js | 41 ++++++--- module/item-competencecreature.js | 10 +-- module/item-sheet.js | 4 +- module/item-sort.js | 3 +- module/item.js | 118 +++++++++++++------------ module/migrations.js | 6 +- module/rdd-empoignade.js | 8 +- module/rdd-hotbar-drop.js | 22 ++--- module/rdd-possession.js | 6 +- module/rdd-tmr-dialog.js | 8 +- module/tmr/draconique.js | 8 +- module/tmr/effets-draconiques.js | 8 +- module/tmr/urgence-draconique.js | 4 +- module/voyage/dialog-fatigue-voyage.js | 4 +- 21 files changed, 181 insertions(+), 167 deletions(-) diff --git a/module/actor.js b/module/actor.js index e8c87a07..6e11783a 100644 --- a/module/actor.js +++ b/module/actor.js @@ -32,7 +32,7 @@ import { RdDItemBlessure } from "./item/blessure.js"; import { AppAstrologie } from "./sommeil/app-astrologie.js"; import { RdDEmpoignade } from "./rdd-empoignade.js"; import { ExperienceLog, XP_TOPIC } from "./actor/experience-log.js"; -import { TYPES } from "./item.js"; +import { ITEM_TYPES } from "./item.js"; import { RdDBaseActorSang } from "./actor/base-actor-sang.js"; import { RdDCoeur } from "./coeur/rdd-coeur.js"; import { DialogChoixXpCarac } from "./dialog-choix-xp-carac.js"; @@ -92,7 +92,7 @@ export class RdDActor extends RdDBaseActorSang { /* -------------------------------------------- */ canReceive(item) { - return ![TYPES.competencecreature, TYPES.tarot, TYPES.service].includes(item.type) + return ![ITEM_TYPES.competencecreature, ITEM_TYPES.tarot, ITEM_TYPES.service].includes(item.type) } isPersonnageJoueur() { @@ -125,7 +125,7 @@ export class RdDActor extends RdDBaseActorSang { /* -------------------------------------------- */ getMalusArmure() { - return this.itemTypes[TYPES.armure].filter(it => it.system.equipe) + return this.itemTypes[ITEM_TYPES.armure].filter(it => it.system.equipe) .map(it => it.system.malus) .reduce(Misc.sum(), 0); } @@ -142,7 +142,7 @@ export class RdDActor extends RdDBaseActorSang { /* -------------------------------------------- */ getDemiReve() { return this.system.reve.tmrpos.coord } - getDraconicList() { return this.itemTypes[TYPES.competence].filter(it => it.system.categorie == 'draconic') } + getDraconicList() { return this.itemTypes[ITEM_TYPES.competence].filter(it => it.system.categorie == 'draconic') } getBestDraconic() { return foundry.utils.duplicate(this.getDraconicList().sort(Misc.descending(it => it.system.niveau)).find(it => true)) } getDraconicOuPossession() { return [...this.getDraconicList().filter(it => it.system.niveau >= 0), @@ -153,7 +153,7 @@ export class RdDActor extends RdDBaseActorSang { /* -------------------------------------------- */ async $perteRevePotionsEnchantees() { - let potions = this.itemTypes[TYPES.potion] + let potions = this.itemTypes[ITEM_TYPES.potion] .filter(it => Grammar.includesLowerCaseNoAccent(it.system.categorie, 'enchanté') && !it.system.prpermanent) const potionUpdates = await Promise.all(potions.map(async it => { @@ -345,7 +345,7 @@ export class RdDActor extends RdDBaseActorSang { /* -------------------------------------------- */ async _recupererBlessures(message, isMaladeEmpoisonne) { const timestamp = game.system.rdd.calendrier.getTimestamp() - const blessures = this.filterItems(it => it.system.gravite > 0, TYPES.blessure).sort(Misc.ascending(it => it.system.gravite)) + const blessures = this.filterItems(it => it.system.gravite > 0, ITEM_TYPES.blessure).sort(Misc.ascending(it => it.system.gravite)) await Promise.all(blessures.map(async b => b.recuperationBlessure({ actor: this, @@ -361,7 +361,7 @@ export class RdDActor extends RdDBaseActorSang { /* -------------------------------------------- */ async _recupererVie(message, isMaladeEmpoisonne) { const tData = this.system - let blessures = this.filterItems(it => it.system.gravite > 0, TYPES.blessure); + let blessures = this.filterItems(it => it.system.gravite > 0, ITEM_TYPES.blessure); if (blessures.length > 0) { return } @@ -636,7 +636,7 @@ export class RdDActor extends RdDBaseActorSang { /* -------------------------------------------- */ async sortMisEnReserve(sort, draconic, coord, ptreve) { await this.createEmbeddedDocuments("Item", [{ - type: TYPES.sortreserve, + type: ITEM_TYPES.sortreserve, name: sort.name, img: sort.img, system: { sortid: sort._id, draconic: (draconic?.name ?? sort.system.draconic), ptreve: ptreve, coord: coord, heurecible: 'Vaisseau' } @@ -991,24 +991,24 @@ export class RdDActor extends RdDBaseActorSang { /* -------------------------------------------- */ buildTMRInnaccessible() { - return this.items.filter(it => it.type == TYPES.casetmr).filter(it => EffetsDraconiques.isInnaccessible(it)).map(it => it.system.coord) + return this.items.filter(it => it.type == ITEM_TYPES.casetmr).filter(it => EffetsDraconiques.isInnaccessible(it)).map(it => it.system.coord) } /* -------------------------------------------- */ getRencontresTMR() { - return this.itemTypes[TYPES.rencontre]; + return this.itemTypes[ITEM_TYPES.rencontre]; } /* -------------------------------------------- */ async deleteRencontreTMRAtPosition() { - const rencontreIds = this.itemTypes[TYPES.rencontre].filter(this.filterRencontreTMRDemiReve()).map(it => it.id) + const rencontreIds = this.itemTypes[ITEM_TYPES.rencontre].filter(this.filterRencontreTMRDemiReve()).map(it => it.id) if (rencontreIds.length > 0) { await this.deleteEmbeddedDocuments('Item', rencontreIds) } } getRencontreTMREnAttente() { - return this.itemTypes[TYPES.rencontre].find(this.filterRencontreTMRDemiReve()) + return this.itemTypes[ITEM_TYPES.rencontre].find(this.filterRencontreTMRDemiReve()) } filterRencontreTMRDemiReve() { @@ -1160,11 +1160,11 @@ export class RdDActor extends RdDBaseActorSang { if (result) { return result } switch (item.type) { - case TYPES.potion: return await this.consommerPotion(item, onActionItem); - case TYPES.livre: return await this.actionLire(item); - case TYPES.conteneur: return await item.sheet.render(true); - case TYPES.herbe: return await this.actionHerbe(item, onActionItem); - case TYPES.queue: case TYPES.ombre: return await this.actionRefoulement(item); + case ITEM_TYPES.potion: return await this.consommerPotion(item, onActionItem); + case ITEM_TYPES.livre: return await this.actionLire(item); + case ITEM_TYPES.conteneur: return await item.sheet.render(true); + case ITEM_TYPES.herbe: return await this.actionHerbe(item, onActionItem); + case ITEM_TYPES.queue: case ITEM_TYPES.ombre: return await this.actionRefoulement(item); } return undefined } @@ -1559,7 +1559,7 @@ export class RdDActor extends RdDBaseActorSang { xpData }) if (hideChatMessage) { - ChatUtility.blindMessageToGM({ content: content }); + ChatUtility.blindMessageToGM({ content: content }) } else { ChatMessage.create({ @@ -1826,7 +1826,7 @@ export class RdDActor extends RdDBaseActorSang { } blessuresASoigner() { - return (this.itemTypes[TYPES.blessure]) + return (this.itemTypes[ITEM_TYPES.blessure]) .filter(it => it.system.gravite > 0 && it.system.gravite <= 6) .filter(it => !(it.system.premierssoins.done && it.system.soinscomplets.done)) .sort(Misc.descending(b => (b.system.premierssoins.done ? "A" : "B") + b.system.gravite)) @@ -3065,7 +3065,7 @@ export class RdDActor extends RdDBaseActorSang { async nouvelleIncarnation() { let incarnation = this.toObject(); - incarnation.items = Array.from(this.items.filter(it => it.type == TYPES.competence), + incarnation.items = Array.from(this.items.filter(it => it.type == ITEM_TYPES.competence), it => { it = it.toObject(); it.id = undefined; diff --git a/module/actor/base-actor-reve.js b/module/actor/base-actor-reve.js index 7938e58a..60ebb6f1 100644 --- a/module/actor/base-actor-reve.js +++ b/module/actor/base-actor-reve.js @@ -12,7 +12,7 @@ import { ReglesOptionnelles } from "../settings/regles-optionnelles.js"; import { RdDBaseActor } from "./base-actor.js"; import { RdDItemCompetenceCreature } from "../item-competencecreature.js"; import { StatusEffects } from "../settings/status-effects.js"; -import { TYPES } from "../item.js"; +import { ITEM_TYPES } from "../item.js"; import { Targets } from "../targets.js"; import { RdDPossession } from "../rdd-possession.js"; import { RdDCombat } from "../rdd-combat.js"; @@ -108,14 +108,14 @@ export class RdDBaseActorReve extends RdDBaseActor { async $finDeRoundSupprimerObsoletes() { const obsoletes = [] - .concat(this.itemTypes[TYPES.empoignade].filter(it => it.system.pointsemp <= 0)) - .concat(this.itemTypes[TYPES.possession].filter(it => it.system.compteur < -2 || it.system.compteur > 2)) + .concat(this.itemTypes[ITEM_TYPES.empoignade].filter(it => it.system.pointsemp <= 0)) + .concat(this.itemTypes[ITEM_TYPES.possession].filter(it => it.system.compteur < -2 || it.system.compteur > 2)) .map(it => it.id); await this.deleteEmbeddedDocuments('Item', obsoletes); } async $finDeRoundEmpoignade() { - const immobilisations = this.itemTypes[TYPES.empoignade].filter(it => it.system.pointsemp >= 2 && it.system.empoigneurid == this.id); + const immobilisations = this.itemTypes[ITEM_TYPES.empoignade].filter(it => it.system.pointsemp >= 2 && it.system.empoigneurid == this.id); immobilisations.forEach(emp => RdDEmpoignade.onImmobilisation(this, game.actors.get(emp.system.empoigneid), emp @@ -151,13 +151,13 @@ export class RdDBaseActorReve extends RdDBaseActor { } getPossession(possessionId) { - return this.itemTypes[TYPES.possession].find(it => it.system.possessionid == possessionId); + return this.itemTypes[ITEM_TYPES.possession].find(it => it.system.possessionid == possessionId); } getPossessions() { - return this.itemTypes[TYPES.possession]; + return this.itemTypes[ITEM_TYPES.possession]; } getEmpoignades() { - return this.itemTypes[TYPES.empoignade]; + return this.itemTypes[ITEM_TYPES.empoignade]; } /* -------------------------------------------- */ @@ -322,7 +322,7 @@ export class RdDBaseActorReve extends RdDBaseActor { RdDEmpoignade.checkEmpoignadeEnCours(this) const competence = this.getCompetence(idOrName); let rollData = { carac: this.system.carac, competence: competence, arme: options.arme } - if (competence.type == TYPES.competencecreature) { + if (competence.type == ITEM_TYPES.competencecreature) { const arme = RdDItemCompetenceCreature.armeCreature(competence) if (arme && options.tryTarget && Targets.hasTargets()) { Targets.selectOneToken(target => { @@ -396,19 +396,7 @@ export class RdDBaseActorReve extends RdDBaseActor { } $getCompetenceArme(arme, competenceName) { - switch (arme.type) { - case TYPES.competencecreature: - return arme.name - case TYPES.arme: - switch (competenceName) { - case 'competence': return arme.system.competence; - case 'unemain': return RdDItemArme.competence1Mains(arme); - case 'deuxmains': return RdDItemArme.competence2Mains(arme); - case 'tir': return arme.system.tir; - case 'lancer': return arme.system.lancer; - } - } - return undefined + return RdDItemArme.getCompetenceArme(arme, competenceName) } verifierForceMin(item) { diff --git a/module/actor/base-actor-sang.js b/module/actor/base-actor-sang.js index 2131666f..1a4ad1e5 100644 --- a/module/actor/base-actor-sang.js +++ b/module/actor/base-actor-sang.js @@ -1,7 +1,7 @@ import { MAX_ENDURANCE_FATIGUE, RdDUtility } from "../rdd-utility.js"; import { ReglesOptionnelles } from "../settings/regles-optionnelles.js"; import { STATUSES } from "../settings/status-effects.js"; -import { TYPES } from "../item.js"; +import { ITEM_TYPES } from "../item.js"; import { RdDBaseActorReve } from "./base-actor-reve.js"; import { RdDDice } from "../rdd-dice.js"; import { RdDItemBlessure } from "../item/blessure.js"; @@ -50,9 +50,9 @@ export class RdDBaseActorSang extends RdDBaseActorReve { isDead() { return this.system.sante.vie.value < -this.getSConst() } - nbBlessuresLegeres() { return this.itemTypes[TYPES.blessure].filter(it => it.isLegere()).length } - nbBlessuresGraves() { return this.itemTypes[TYPES.blessure].filter(it => it.isGrave()).length } - nbBlessuresCritiques() { return this.itemTypes[TYPES.blessure].filter(it => it.isCritique()).length } + nbBlessuresLegeres() { return this.itemTypes[ITEM_TYPES.blessure].filter(it => it.isLegere()).length } + nbBlessuresGraves() { return this.itemTypes[ITEM_TYPES.blessure].filter(it => it.isGrave()).length } + nbBlessuresCritiques() { return this.itemTypes[ITEM_TYPES.blessure].filter(it => it.isCritique()).length } /* -------------------------------------------- */ computeResumeBlessure() { @@ -197,7 +197,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve { } async supprimerBlessures(filterToDelete) { - const toDelete = this.filterItems(filterToDelete, TYPES.blessure) + const toDelete = this.filterItems(filterToDelete, ITEM_TYPES.blessure) .map(it => it.id); await this.deleteEmbeddedDocuments('Item', toDelete); } diff --git a/module/actor/base-actor-sheet.js b/module/actor/base-actor-sheet.js index 8af1c89e..c83106b7 100644 --- a/module/actor/base-actor-sheet.js +++ b/module/actor/base-actor-sheet.js @@ -3,7 +3,7 @@ import { Misc } from "../misc.js"; import { DialogSplitItem } from "../dialog-split-item.js"; import { RdDSheetUtility } from "../rdd-sheet-utility.js"; import { Monnaie } from "../item-monnaie.js"; -import { RdDItem, TYPES } from "../item.js"; +import { RdDItem, ITEM_TYPES } from "../item.js"; import { RdDItemCompetenceCreature } from "../item-competencecreature.js"; /* -------------------------------------------- */ @@ -51,7 +51,7 @@ export class RdDBaseActorSheet extends ActorSheet { this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.inventaires); this._appliquerRechercheObjets(formData.conteneurs, formData.inventaires); formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs); - formData.competences.filter(it => it.type == TYPES.competencecreature) + formData.competences.filter(it => it.type == ITEM_TYPES.competencecreature) .forEach(it => it.isdommages = RdDItemCompetenceCreature.isDommages(it)) return formData; } diff --git a/module/actor/base-actor.js b/module/actor/base-actor.js index 4b35d754..a8c5f1a1 100644 --- a/module/actor/base-actor.js +++ b/module/actor/base-actor.js @@ -3,7 +3,7 @@ import { ChatUtility } from "../chat-utility.js"; import { SYSTEM_SOCKET_ID } from "../constants.js"; import { Grammar } from "../grammar.js"; import { Monnaie } from "../item-monnaie.js"; -import { TYPES } from "../item.js"; +import { ITEM_TYPES } from "../item.js"; import { Misc } from "../misc.js"; import { RdDAudio } from "../rdd-audio.js"; import { RdDConfirm } from "../rdd-confirm.js"; @@ -704,7 +704,7 @@ export class RdDBaseActor extends Actor { async actionPrincipale(item, onActionItem = async () => { }) { switch (item.type) { - case TYPES.conteneur: return await item.sheet.render(true); + case ITEM_TYPES.conteneur: return await item.sheet.render(true); } return undefined } diff --git a/module/actor/creature.js b/module/actor/creature.js index 67b36168..d0307e66 100644 --- a/module/actor/creature.js +++ b/module/actor/creature.js @@ -1,5 +1,5 @@ import { ENTITE_INCARNE } from "../constants.js"; -import { TYPES } from "../item.js"; +import { ITEM_TYPES } from "../item.js"; import { STATUSES } from "../settings/status-effects.js"; import { RdDBaseActorSang } from "./base-actor-sang.js"; @@ -12,7 +12,7 @@ export class RdDCreature extends RdDBaseActorSang { isCreature() { return true } canReceive(item) { - return item.type == TYPES.competencecreature || item.isInventaire(); + return item.type == ITEM_TYPES.competencecreature || item.isInventaire(); } async remiseANeuf() { diff --git a/module/actor/entite.js b/module/actor/entite.js index ca63f334..70bc0577 100644 --- a/module/actor/entite.js +++ b/module/actor/entite.js @@ -1,5 +1,5 @@ import { ENTITE_INCARNE, ENTITE_NONINCARNE } from "../constants.js"; -import { TYPES } from "../item.js"; +import { ITEM_TYPES } from "../item.js"; import { Misc } from "../misc.js"; import { RdDEncaisser } from "../rdd-roll-encaisser.js"; import { STATUSES } from "../settings/status-effects.js"; @@ -12,7 +12,7 @@ export class RdDEntite extends RdDBaseActorReve { } canReceive(item) { - return item.type == TYPES.competencecreature + return item.type == ITEM_TYPES.competencecreature } isEntite(typeentite = []) { @@ -29,7 +29,7 @@ export class RdDEntite extends RdDBaseActorReve { getChance() { return this.getReve() } getDraconicOuPossession() { - return this.itemTypes[TYPES.competencecreature] + return this.itemTypes[ITEM_TYPES.competencecreature] .filter(it => it.system.categorie == 'possession') .sort(Misc.descending(it => it.system.niveau)) .find(it => true); diff --git a/module/item-arme.js b/module/item-arme.js index 695a2bde..7b0dd219 100644 --- a/module/item-arme.js +++ b/module/item-arme.js @@ -1,5 +1,5 @@ import { RdDItemCompetenceCreature } from "./item-competencecreature.js" -import { TYPES } from "./item.js"; +import { ITEM_TYPES } from "./item.js"; import { RdDCombatManager } from "./rdd-combat.js"; const nomCategorieParade = { @@ -20,19 +20,35 @@ const nomCategorieParade = { export class RdDItemArme extends Item { static isArme(item) { - return item.type == TYPES.arme || RdDItemCompetenceCreature.getCategorieAttaque(item); + return item.type == ITEM_TYPES.arme || RdDItemCompetenceCreature.getCategorieAttaque(item); } /* -------------------------------------------- */ static getArme(arme) { switch (arme ? arme.type : '') { - case TYPES.arme: return arme; - case TYPES.competencecreature: + case ITEM_TYPES.arme: return arme; + case ITEM_TYPES.competencecreature: return RdDItemCompetenceCreature.armeCreature(arme); } return RdDItemArme.mainsNues(); } + static getCompetenceArme(arme, competenceName) { + switch (arme.type) { + case ITEM_TYPES.competencecreature: + return arme.name + case ITEM_TYPES.arme: + switch (competenceName) { + case 'competence': return arme.system.competence; + case 'unemain': return RdDItemArme.competence1Mains(arme); + case 'deuxmains': return RdDItemArme.competence2Mains(arme); + case 'tir': return arme.system.tir; + case 'lancer': return arme.system.lancer; + } + } + return undefined + } + static computeNiveauArmes(armes, competences) { for (const arme of armes) { arme.system.niveau = RdDItemArme.niveauCompetenceArme(arme, competences); @@ -68,14 +84,14 @@ export class RdDItemArme extends Item { return armeData.system.categorie_parade; } // pour compatibilité avec des personnages existants - if (armeData.type == TYPES.competencecreature || armeData.system.categorie == 'creature') { + if (armeData.type == ITEM_TYPES.competencecreature || armeData.system.categorie == 'creature') { return armeData.system.categorie_parade || (armeData.system.isparade ? 'armes-naturelles' : ''); } if (!armeData.type.match(/arme|competencecreature/)) { return ''; } if (armeData.system.competence == undefined) { - return TYPES.competencecreature; + return ITEM_TYPES.competencecreature; } let compname = armeData.system.competence.toLowerCase(); if (compname.match(/^(dague de jet|javelot|fouet|arc|arbalête|fronde|hache de jet|fléau)$/)) return ''; @@ -157,18 +173,19 @@ export class RdDItemArme extends Item { } return armeData; } - static competence2Mains(arme) { - return arme.system.competence.replace(" 1 main", " 2 mains"); - } static competence1Mains(arme) { return arme.system.competence.replace(" 2 mains", " 1 main"); } + static competence2Mains(arme) { + return arme.system.competence.replace(" 1 main", " 2 mains"); + } + static isArmeUtilisable(arme) { switch (arme.type) { - case TYPES.arme: return arme.system.equipe && (arme.system.resistance > 0 || arme.system.portee_courte > 0) - case TYPES.competencecreature: return true + case ITEM_TYPES.arme: return arme.system.equipe && (arme.system.resistance > 0 || arme.system.portee_courte > 0) + case ITEM_TYPES.competencecreature: return true } return false } @@ -184,7 +201,7 @@ export class RdDItemArme extends Item { return { _id: competence?.id, name: 'Corps à corps', - type: TYPES.arme, + type: ITEM_TYPES.arme, img: 'systems/foundryvtt-reve-de-dragon/icons/competence_corps_a_corps.webp', system: { initiative: RdDCombatManager.calculInitiative(competence.system.niveau, melee), diff --git a/module/item-competencecreature.js b/module/item-competencecreature.js index d16f8aba..19ebf2c7 100644 --- a/module/item-competencecreature.js +++ b/module/item-competencecreature.js @@ -1,5 +1,5 @@ -import { TYPES } from "./item.js"; +import { ITEM_TYPES } from "./item.js"; import { RdDCombatManager } from "./rdd-combat.js"; const categories = { @@ -54,7 +54,7 @@ export class RdDItemCompetenceCreature extends Item { /* -------------------------------------------- */ static isCompetenceAttaque(item) { - if (item.type == TYPES.competencecreature) { + if (item.type == ITEM_TYPES.competencecreature) { switch (item.system.categorie) { case "melee": case "tir": @@ -68,7 +68,7 @@ export class RdDItemCompetenceCreature extends Item { } static getCategorieAttaque(item) { - if (item.type == TYPES.competencecreature) { + if (item.type == ITEM_TYPES.competencecreature) { switch (item.system.categorie) { case "melee": case "tir": @@ -82,7 +82,7 @@ export class RdDItemCompetenceCreature extends Item { return undefined } static isDommages(item) { - if (item.type == TYPES.competencecreature) { + if (item.type == ITEM_TYPES.competencecreature) { switch (item.system.categorie) { case "melee": case "tir": @@ -94,7 +94,7 @@ export class RdDItemCompetenceCreature extends Item { return false } static isParade(item) { - if (item.type == TYPES.competencecreature) { + if (item.type == ITEM_TYPES.competencecreature) { switch (item.system.categorie) { case "melee": case "naturelle": diff --git a/module/item-sheet.js b/module/item-sheet.js index fd8b90e3..a9292fbb 100644 --- a/module/item-sheet.js +++ b/module/item-sheet.js @@ -12,7 +12,7 @@ import { SystemCompendiums } from "./settings/system-compendiums.js"; import { Misc } from "./misc.js"; import { RdDTimestamp } from "./time/rdd-timestamp.js"; import { RdDItemCompetenceCreature } from "./item-competencecreature.js"; -import { TYPES } from "./item.js"; +import { ITEM_TYPES } from "./item.js"; /** * Extend the basic ItemSheet for RdD specific items @@ -101,7 +101,7 @@ export class RdDItemSheet extends ItemSheet { isComestible: this.item.getUtilisationCuisine(), options: RdDSheetUtility.mergeDocumentRights(this.options, this.item, this.isEditable), } - if (this.item.type == TYPES.competencecreature) { + if (this.item.type == ITEM_TYPES.competencecreature) { formData.isparade = RdDItemCompetenceCreature.isParade(this.item) formData.isdommages = RdDItemCompetenceCreature.isDommages(this.item) } diff --git a/module/item-sort.js b/module/item-sort.js index 09f9be37..e8141407 100644 --- a/module/item-sort.js +++ b/module/item-sort.js @@ -1,3 +1,4 @@ +import { ITEM_TYPES } from "./item.js"; import { Misc } from "./misc.js"; import { TMRUtility } from "./tmr-utility.js"; @@ -44,7 +45,7 @@ export class RdDItemSort extends Item { */ static getBonusCaseList(item, newCase = false) { // Gestion spéciale case bonus - if (item.type == 'sort') { + if (item.type == ITEM_TYPES.sort) { return RdDItemSort.buildBonusCaseList(item.system.bonuscase, newCase); } return undefined; diff --git a/module/item.js b/module/item.js index 8569d3b9..fe6d25ad 100644 --- a/module/item.js +++ b/module/item.js @@ -9,7 +9,15 @@ import { RdDRaretes } from "./item/raretes.js"; import { RdDItemCompetence } from "./item-competence.js"; import { RdDItemCompetenceCreature } from "./item-competencecreature.js"; -export const TYPES = { +export const ACTOR_TYPES = { + personnage: 'personnage', + creature: 'creature', + entite: 'entite', + commerce: 'commerce', + vehicule: 'vehicule' +} + +export const ITEM_TYPES = { competence: 'competence', competencecreature: 'competencecreature', empoignade: 'empoignade', @@ -56,33 +64,33 @@ export const TYPES = { } const typesInventaireMateriel = [ - TYPES.arme, - TYPES.armure, - TYPES.conteneur, - TYPES.faune, - TYPES.gemme, - TYPES.herbe, - TYPES.plante, - TYPES.ingredient, - TYPES.livre, - TYPES.monnaie, - TYPES.munition, - TYPES.nourritureboisson, - TYPES.objet, - TYPES.potion, + ITEM_TYPES.arme, + ITEM_TYPES.armure, + ITEM_TYPES.conteneur, + ITEM_TYPES.faune, + ITEM_TYPES.gemme, + ITEM_TYPES.herbe, + ITEM_TYPES.plante, + ITEM_TYPES.ingredient, + ITEM_TYPES.livre, + ITEM_TYPES.monnaie, + ITEM_TYPES.munition, + ITEM_TYPES.nourritureboisson, + ITEM_TYPES.objet, + ITEM_TYPES.potion, ] const typesInventaire = { materiel: typesInventaireMateriel, all: ['service'].concat(typesInventaireMateriel), } -const typesObjetsOeuvres = [TYPES.oeuvre, TYPES.recettecuisine, TYPES.musique, TYPES.chant, TYPES.danse, TYPES.jeu] -const typesObjetsDraconiques = [TYPES.queue, TYPES.ombre, TYPES.souffle, TYPES.tete, TYPES.signedraconique, TYPES.sortreserve, TYPES.rencontre] -const typesObjetsConnaissance = [TYPES.meditation, TYPES.recettealchimique, TYPES.sort] -const typesObjetsEffet = [TYPES.possession, TYPES.poison, TYPES.maladie, TYPES.blessure] -const typesObjetsCompetence = [TYPES.competence, TYPES.competencecreature] -const typesObjetsTemporels = [TYPES.blessure, TYPES.poison, TYPES.maladie, TYPES.queue, TYPES.ombre, TYPES.souffle, TYPES.signedraconique, TYPES.rencontre] -const typesObjetsEquipable = [TYPES.arme, TYPES.armure, TYPES.objet]; +const typesObjetsOeuvres = [ITEM_TYPES.oeuvre, ITEM_TYPES.recettecuisine, ITEM_TYPES.musique, ITEM_TYPES.chant, ITEM_TYPES.danse, ITEM_TYPES.jeu] +const typesObjetsDraconiques = [ITEM_TYPES.queue, ITEM_TYPES.ombre, ITEM_TYPES.souffle, ITEM_TYPES.tete, ITEM_TYPES.signedraconique, ITEM_TYPES.sortreserve, ITEM_TYPES.rencontre] +const typesObjetsConnaissance = [ITEM_TYPES.meditation, ITEM_TYPES.recettealchimique, ITEM_TYPES.sort] +const typesObjetsEffet = [ITEM_TYPES.possession, ITEM_TYPES.poison, ITEM_TYPES.maladie, ITEM_TYPES.blessure] +const typesObjetsCompetence = [ITEM_TYPES.competence, ITEM_TYPES.competencecreature] +const typesObjetsTemporels = [ITEM_TYPES.blessure, ITEM_TYPES.poison, ITEM_TYPES.maladie, ITEM_TYPES.queue, ITEM_TYPES.ombre, ITEM_TYPES.souffle, ITEM_TYPES.signedraconique, ITEM_TYPES.rencontre] +const typesObjetsEquipable = [ITEM_TYPES.arme, ITEM_TYPES.armure, ITEM_TYPES.objet]; const typesEnvironnement = typesInventaireMateriel; const encBrin = 0.00005; // un brin = 1 décigramme = 1/10g = 1/10000kg = 1/20000 enc const encPepin = 0.0007; /* un pépin de gemme = 1/10 cm3 = 1/1000 l = 3.5/1000 kg = 7/2000 kg = 7/1000 enc @@ -141,12 +149,12 @@ export class RdDItem extends Item { static isFieldInventaireModifiable(type, field) { switch (field) { case 'quantite': - if ([TYPES.conteneur].includes(type)) { + if ([ITEM_TYPES.conteneur].includes(type)) { return false; } break; case 'cout': - if ([TYPES.monnaie].includes(type)) { + if ([ITEM_TYPES.monnaie].includes(type)) { return game.user.isGM; } break; @@ -195,15 +203,15 @@ export class RdDItem extends Item { getUniteQuantite() { switch (this.type) { - case TYPES.monnaie: return "(Pièces)" - case TYPES.herbe: + case ITEM_TYPES.monnaie: return "(Pièces)" + case ITEM_TYPES.herbe: switch (this.system.categorie) { case 'Alchimie': case 'Repos': case 'Soin': return "(Brins)" case 'Cuisine': return ''; } return ''; - case TYPES.ingredient: return "(Pépins ou Brins)" + case ITEM_TYPES.ingredient: return "(Pépins ou Brins)" } return ''; } @@ -212,13 +220,13 @@ export class RdDItem extends Item { return typesObjetsEquipable.includes(this.type) } - isCompetencePersonnage() { return this.type == TYPES.competence } - isCompetenceCreature() { return this.type == TYPES.competencecreature } - isConteneur() { return this.type == TYPES.conteneur; } - isMonnaie() { return this.type == TYPES.monnaie; } - isPotion() { return this.type == TYPES.potion; } - isNourritureBoisson() { return this.type == TYPES.nourritureboisson; } - isService() { return this.type == TYPES.service; } + isCompetencePersonnage() { return this.type == ITEM_TYPES.competence } + isCompetenceCreature() { return this.type == ITEM_TYPES.competencecreature } + isConteneur() { return this.type == ITEM_TYPES.conteneur; } + isMonnaie() { return this.type == ITEM_TYPES.monnaie; } + isPotion() { return this.type == ITEM_TYPES.potion; } + isNourritureBoisson() { return this.type == ITEM_TYPES.nourritureboisson; } + isService() { return this.type == ITEM_TYPES.service; } isCompetence() { return typesObjetsCompetence.includes(this.type) } isEsquive() { @@ -237,27 +245,27 @@ export class RdDItem extends Item { return this.isCompetence() && ['melee', 'tir', 'lancer'].includes(this.system.categorie) } - isCompetencePossession() { return TYPES.competencecreature == this.type && this.system.categorie == "possession" } + isCompetencePossession() { return ITEM_TYPES.competencecreature == this.type && this.system.categorie == "possession" } isTemporel() { return typesObjetsTemporels.includes(this.type) } isOeuvre() { return typesObjetsOeuvres.includes(this.type) } isDraconique() { return RdDItem.getItemTypesDraconiques().includes(this.type) } - isQueueDragon() { return [TYPES.queue, TYPES.ombre].includes(this.type) } + isQueueDragon() { return [ITEM_TYPES.queue, ITEM_TYPES.ombre].includes(this.type) } isEffet() { return typesObjetsEffet.includes(this.type) } isConnaissance() { return typesObjetsConnaissance.includes(this.type) } isInventaire(mode = 'materiel') { return RdDItem.getItemTypesInventaire(mode).includes(this.type); } isBoisson() { return this.isNourritureBoisson() && this.system.boisson; } isAlcool() { return this.isNourritureBoisson() && this.system.boisson && this.system.alcoolise; } - isHerbeAPotion() { return this.type == TYPES.herbe && (this.system.categorie == 'Soin' || this.system.categorie == 'Repos'); } - isBlessure() { return this.type == TYPES.blessure } + isHerbeAPotion() { return this.type == ITEM_TYPES.herbe && (this.system.categorie == 'Soin' || this.system.categorie == 'Repos'); } + isBlessure() { return this.type == ITEM_TYPES.blessure } isPresentDansMilieux(milieux) { return this.getEnvironnements(milieux).length > 0 } getCategories() { switch (this.type) { - case TYPES.competence: return RdDItemCompetence.getCategories() - case TYPES.competencecreature: return RdDItemCompetenceCreature.getCategories() + case ITEM_TYPES.competence: return RdDItemCompetence.getCategories() + case ITEM_TYPES.competencecreature: return RdDItemCompetenceCreature.getCategories() } return {} } @@ -341,15 +349,15 @@ export class RdDItem extends Item { getUtilisation() { switch (this.type) { - case TYPES.potion: + case ITEM_TYPES.potion: switch (this.system.categorie) { case 'Alchimie': case 'AlchimieEnchante': case 'AlchimieAutre': return 'alchimie' case 'Cuisine': return 'cuisine' case 'Remede': case 'Repos': case 'ReposEnchante': case 'Soin': case 'SoinEnchante': return 'soins' } return ''; - case TYPES.nourritureboisson: return 'cuisine'; - case TYPES.herbe: case TYPES.faune: case TYPES.ingredient: case TYPES.plante: + case ITEM_TYPES.nourritureboisson: return 'cuisine'; + case ITEM_TYPES.herbe: case ITEM_TYPES.faune: case ITEM_TYPES.ingredient: case ITEM_TYPES.plante: switch (this.system.categorie) { case 'Cuisine': return 'cuisine'; case 'Toxique': case 'Poison': return 'poison'; @@ -364,9 +372,9 @@ export class RdDItem extends Item { getUtilisationCuisine() { if (this.getUtilisation() == 'cuisine') { switch (this.type) { - case TYPES.nourritureboisson: + case ITEM_TYPES.nourritureboisson: return 'pret'; - case TYPES.herbe: case TYPES.faune: case TYPES.ingredient: case TYPES.plante: + case ITEM_TYPES.herbe: case ITEM_TYPES.faune: case ITEM_TYPES.ingredient: case ITEM_TYPES.plante: return 'brut'; } } @@ -374,7 +382,7 @@ export class RdDItem extends Item { } isCristalAlchimique() { - return this.type == TYPES.objet && Grammar.includesLowerCaseNoAccent(this.name, 'cristal alchimique') && this.system.quantite > 0; + return this.type == ITEM_TYPES.objet && Grammar.includesLowerCaseNoAccent(this.name, 'cristal alchimique') && this.system.quantite > 0; } isMagique() { @@ -402,11 +410,11 @@ export class RdDItem extends Item { getEnc() { switch (this.type) { - case TYPES.service: + case ITEM_TYPES.service: return 0; - case TYPES.herbe: + case ITEM_TYPES.herbe: return this.getEncHerbe(); - case TYPES.gemme: + case ITEM_TYPES.gemme: return encPepin * this.system.taille; } return Math.max(this.system.encombrement ?? 0, 0); @@ -484,7 +492,7 @@ export class RdDItem extends Item { getActionPrincipale(options = { warnIfNot: true }) { switch (this.type) { - case TYPES.conteneur: return 'Ouvrir'; + case ITEM_TYPES.conteneur: return 'Ouvrir'; } if (this.actor?.isPersonnage()) { const warn = options.warnIfNot; @@ -492,11 +500,11 @@ export class RdDItem extends Item { return 'Cuisiner'; } switch (this.type) { - case TYPES.nourritureboisson: return this._actionOrWarnQuantiteZero(this.system.boisson ? 'Boire' : 'Manger', warn); - case TYPES.potion: return this._actionOrWarnQuantiteZero('Consommer', warn); - case TYPES.livre: return this._actionOrWarnQuantiteZero('Lire', warn); - case TYPES.herbe: return this.isHerbeAPotion() ? this._actionOrWarnQuantiteZero('Décoction', warn) : undefined; - case TYPES.queue: case TYPES.ombre: return this.system.refoulement > 0 ? 'Refouler' : undefined; + case ITEM_TYPES.nourritureboisson: return this._actionOrWarnQuantiteZero(this.system.boisson ? 'Boire' : 'Manger', warn); + case ITEM_TYPES.potion: return this._actionOrWarnQuantiteZero('Consommer', warn); + case ITEM_TYPES.livre: return this._actionOrWarnQuantiteZero('Lire', warn); + case ITEM_TYPES.herbe: return this.isHerbeAPotion() ? this._actionOrWarnQuantiteZero('Décoction', warn) : undefined; + case ITEM_TYPES.queue: case ITEM_TYPES.ombre: return this.system.refoulement > 0 ? 'Refouler' : undefined; } } return undefined; diff --git a/module/migrations.js b/module/migrations.js index 675e2088..c608d08a 100644 --- a/module/migrations.js +++ b/module/migrations.js @@ -2,7 +2,7 @@ import { RdDBaseActor } from "./actor/base-actor.js"; import { LOG_HEAD, SYSTEM_RDD } from "./constants.js"; import { Grammar } from "./grammar.js"; import { Monnaie } from "./item-monnaie.js"; -import { RdDItem, TYPES } from "./item.js"; +import { RdDItem, ITEM_TYPES } from "./item.js"; import { RdDTimestamp } from "./time/rdd-timestamp.js"; import { RdDRaretes } from "./item/raretes.js"; import { RdDCalendrier } from "./time/rdd-calendrier.js"; @@ -465,7 +465,7 @@ class _10_7_19_CategorieCompetenceCreature extends Migration { async migrate() { await this.applyItemsUpdates(items => items - .filter(it => TYPES.competencecreature == it.type) + .filter(it => ITEM_TYPES.competencecreature == it.type) .map(it => this.migrateCompetenceCreature(it)) ); } @@ -502,7 +502,7 @@ class _10_7_19_PossessionsEntiteVictime extends Migration { async migrate() { await this.applyItemsUpdates(items => items - .filter(it => TYPES.possession == it.type) + .filter(it => ITEM_TYPES.possession == it.type) .map(it => this.migratePossession(it)) ); } diff --git a/module/rdd-empoignade.js b/module/rdd-empoignade.js index 49778fd2..81c3b965 100644 --- a/module/rdd-empoignade.js +++ b/module/rdd-empoignade.js @@ -5,7 +5,7 @@ import { RdDItemCompetenceCreature } from "./item-competencecreature.js"; import { ChatUtility } from "./chat-utility.js"; import { STATUSES } from "./settings/status-effects.js"; import { ReglesOptionnelles } from "./settings/regles-optionnelles.js"; -import { TYPES } from "./item.js"; +import { ITEM_TYPES } from "./item.js"; /* -------------------------------------------- */ @@ -92,18 +92,18 @@ export class RdDEmpoignade { /* -------------------------------------------- */ static isEmpoignadeEnCours(actor) { - return actor.itemTypes[TYPES.empoignade].find(it => it.system.pointsemp > 0) + return actor.itemTypes[ITEM_TYPES.empoignade].find(it => it.system.pointsemp > 0) } /* -------------------------------------------- */ static getEmpoignadeById(actor, id) { - let emp = actor.itemTypes[TYPES.empoignade].find(it => it.system.empoignadeid == id) + let emp = actor.itemTypes[ITEM_TYPES.empoignade].find(it => it.system.empoignadeid == id) return emp && foundry.utils.duplicate(emp) || undefined; } /* -------------------------------------------- */ static getEmpoignade(attacker, defender) { - let emp = attacker.itemTypes[TYPES.empoignade].find(it => + let emp = attacker.itemTypes[ITEM_TYPES.empoignade].find(it => (it.system.empoigneurid == attacker.id && it.system.empoigneid == defender.id) || (it.system.empoigneurid == defender.id && it.system.empoigneid == attacker.id) ) diff --git a/module/rdd-hotbar-drop.js b/module/rdd-hotbar-drop.js index edb8ae1e..7bb6db05 100644 --- a/module/rdd-hotbar-drop.js +++ b/module/rdd-hotbar-drop.js @@ -1,6 +1,6 @@ import { RdDItemArme } from "./item-arme.js"; import { RdDItemCompetenceCreature } from "./item-competencecreature.js"; -import { TYPES } from "./item.js"; +import { ITEM_TYPES } from "./item.js"; export class RdDHotbar { @@ -35,7 +35,7 @@ export class RdDHotbar { static async addToHotbar(item, slot) { switch (item?.type ?? '') { - case TYPES.arme: + case ITEM_TYPES.arme: { // Les armes peuvent avoir plusieurs usages if (item.system.competence != '') { @@ -54,12 +54,12 @@ export class RdDHotbar { } } return - case TYPES.competencecreature: + case ITEM_TYPES.competencecreature: const categorie = RdDItemCompetenceCreature.getCategorieAttaque(item) ?? 'competence'; await this.createItemMacro(item, slot, categorie) return default: - case TYPES.competence: + case ITEM_TYPES.competence: await this.createItemMacro(item, slot++, 'competence') if (item.isCorpsACorps()) { await this.createItemMacro(item, slot++, 'pugilat') @@ -79,7 +79,7 @@ export class RdDHotbar { * Actor - open actor sheet * Journal - open journal sheet */ - static initDropbar() { + static init() { Hooks.on('hotbarDrop', (bar, documentData, slot) => { @@ -88,9 +88,9 @@ export class RdDHotbar { const item = fromUuidSync(documentData.uuid) ?? this.actor.items.get(documentData.uuid) console.log('DROP', documentData, item) switch (item?.type) { - case TYPES.arme: - case TYPES.competence: - case TYPES.competencecreature: + case ITEM_TYPES.arme: + case ITEM_TYPES.competence: + case ITEM_TYPES.competencecreature: this.addToHotbar(item, slot) return false } @@ -116,9 +116,9 @@ export class RdDHotbar { // Trigger the item roll switch (item.type) { - case TYPES.arme: + case ITEM_TYPES.arme: return actor.rollArme(item, categorieArme); - case TYPES.competence: + case ITEM_TYPES.competence: if (item.isCorpsACorps()) { switch (categorieArme) { case 'pugilat': @@ -128,7 +128,7 @@ export class RdDHotbar { } } return actor.rollCompetence(item); - case TYPES.competencecreature: + case ITEM_TYPES.competencecreature: return item.system.iscombat && !item.system.isparade ? actor.rollArme(item, categorieArme) : actor.rollCompetence(item); diff --git a/module/rdd-possession.js b/module/rdd-possession.js index 93409689..57c3a142 100644 --- a/module/rdd-possession.js +++ b/module/rdd-possession.js @@ -3,7 +3,7 @@ import { RdDResolutionTable } from "./rdd-resolution-table.js"; import { RdDRoll } from "./rdd-roll.js"; import { RdDItemCompetenceCreature } from "./item-competencecreature.js"; import { Targets } from "./targets.js"; -import { TYPES } from "./item.js"; +import { ITEM_TYPES } from "./item.js"; /* -------------------------------------------- */ /* On part du principe qu'une entité démarre tjs @@ -20,9 +20,9 @@ export class RdDPossession { /* -------------------------------------------- */ static searchPossessionFromEntite(attacker, defender) { - let poss = attacker.items.find(poss => poss.type == TYPES.possession && poss.system.victime.actorid == defender.id); + let poss = attacker.items.find(poss => poss.type == ITEM_TYPES.possession && poss.system.victime.actorid == defender.id); if (!poss) { - poss = defender.items.find(poss => poss.type == TYPES.possession && poss.system.victime.actorid == defender.id); + poss = defender.items.find(poss => poss.type == ITEM_TYPES.possession && poss.system.victime.actorid == defender.id); } return poss && foundry.utils.duplicate(poss) || undefined; } diff --git a/module/rdd-tmr-dialog.js b/module/rdd-tmr-dialog.js index 7eb633ab..5b388e2b 100644 --- a/module/rdd-tmr-dialog.js +++ b/module/rdd-tmr-dialog.js @@ -16,7 +16,7 @@ import { RdDDice } from "./rdd-dice.js"; import { STATUSES } from "./settings/status-effects.js"; import { RdDRencontre } from "./item/rencontre.js"; import { RdDTimestamp } from "./time/rdd-timestamp.js"; -import { TYPES } from "./item.js"; +import { ITEM_TYPES } from "./item.js"; import { Misc } from "./misc.js"; const TMR_DISPLAY_SIZE = { @@ -208,11 +208,11 @@ export class RdDTMRDialog extends Dialog { } get sortsReserve() { - return this.actor.itemTypes[TYPES.sortreserve]; + return this.actor.itemTypes[ITEM_TYPES.sortreserve]; } getSortsReserve(coord) { - return this.actor.itemTypes[TYPES.sortreserve].filter(// Reserve sur une case fleuve ou normale + return this.actor.itemTypes[ITEM_TYPES.sortreserve].filter(// Reserve sur une case fleuve ou normale TMRUtility.getTMR(coord).type == 'fleuve' ? it => TMRUtility.getTMR(it.system.coord).type == 'fleuve' : it => it.system.coord == coord @@ -270,7 +270,7 @@ export class RdDTMRDialog extends Dialog { } _getTokensSortsReserve() { - const sortsReserve = this.actor.itemTypes[TYPES.sortreserve]; + const sortsReserve = this.actor.itemTypes[ITEM_TYPES.sortreserve]; return Misc.concat(sortsReserve.map(sortReserve => EffetsDraconiques.sortReserve.tokens(this.pixiTMR, sortReserve, () => sortReserve.system.coord))) } diff --git a/module/tmr/draconique.js b/module/tmr/draconique.js index 90b58092..fb12145e 100644 --- a/module/tmr/draconique.js +++ b/module/tmr/draconique.js @@ -1,4 +1,4 @@ -import { TYPES } from "../item.js"; +import { ITEM_TYPES } from "../item.js"; import { TMRUtility } from "../tmr-utility.js"; import { PixiTMR } from "./pixi-tmr.js"; @@ -12,10 +12,10 @@ export class Draconique { static init() { } - static isCaseTMR(item) { return item.type == TYPES.casetmr; } + static isCaseTMR(item) { return item.type == ITEM_TYPES.casetmr; } static isQueueDragon(item) { return item.isQueueDragon(); } - static isSouffleDragon(item) { return item.type == TYPES.souffle; } - static isTeteDragon(item) { return item.type == TYPES.tete; } + static isSouffleDragon(item) { return item.type == ITEM_TYPES.souffle; } + static isTeteDragon(item) { return item.type == ITEM_TYPES.tete; } static isQueueSouffle(item) { return Draconique.isQueueDragon(item) || Draconique.isSouffleDragon(item); } static register(draconique, code = undefined) { diff --git a/module/tmr/effets-draconiques.js b/module/tmr/effets-draconiques.js index 1b0753d1..80ed02ca 100644 --- a/module/tmr/effets-draconiques.js +++ b/module/tmr/effets-draconiques.js @@ -18,7 +18,7 @@ import { Periple } from "./periple.js"; import { UrgenceDraconique } from "./urgence-draconique.js"; import { Grammar } from "../grammar.js"; import { AugmentationSeuil } from "./augmentation-seuil.js"; -import { TYPES } from "../item.js"; +import { ITEM_TYPES } from "../item.js"; export class EffetsDraconiques { static carteTmr = new CarteTmr(); @@ -122,11 +122,11 @@ export class EffetsDraconiques { } static tetesDragon(actor, name) { - return actor.itemTypes[TYPES.tete].filter(it => Grammar.includesLowerCaseNoAccent(it.name, name)); + return actor.itemTypes[ITEM_TYPES.tete].filter(it => Grammar.includesLowerCaseNoAccent(it.name, name)); } static soufflesDragon(actor, name) { - return actor.itemTypes[TYPES.souffle].filter(it => Grammar.includesLowerCaseNoAccent(it.name, name)); + return actor.itemTypes[ITEM_TYPES.souffle].filter(it => Grammar.includesLowerCaseNoAccent(it.name, name)); } static queuesDragon(actor, name) { @@ -134,7 +134,7 @@ export class EffetsDraconiques { } static queuesSoufflesDragon(actor, name) { - return actor.filterItems(it => [TYPES.queue, TYPES.ombre, TYPES.souffle].includes(it.type) && Grammar.includesLowerCaseNoAccent(it.name, name)); + return actor.filterItems(it => [ITEM_TYPES.queue, ITEM_TYPES.ombre, ITEM_TYPES.souffle].includes(it.type) && Grammar.includesLowerCaseNoAccent(it.name, name)); } static countAugmentationSeuil(actor) { diff --git a/module/tmr/urgence-draconique.js b/module/tmr/urgence-draconique.js index 03a6f94b..f3c00769 100644 --- a/module/tmr/urgence-draconique.js +++ b/module/tmr/urgence-draconique.js @@ -5,7 +5,7 @@ import { RdDRollTables } from "../rdd-rolltables.js"; import { TMRUtility } from "../tmr-utility.js"; import { tmrTokenZIndex } from "../tmr-constants.js"; import { Draconique } from "./draconique.js"; -import { TYPES } from "../item.js"; +import { ITEM_TYPES } from "../item.js"; import { TMRAnimations } from "./animation.js"; export class UrgenceDraconique extends Draconique { @@ -14,7 +14,7 @@ export class UrgenceDraconique extends Draconique { match(item) { return Draconique.isQueueDragon(item) && Grammar.toLowerCaseNoAccent(item.name).includes('urgence draconique'); } manualMessage() { return false } async onActorCreateOwned(actor, queue) { - const coordSortsReserve = actor.itemTypes[TYPES.sortreserve].map(it => it.system.coord) ?? []; + const coordSortsReserve = actor.itemTypes[ITEM_TYPES.sortreserve].map(it => it.system.coord) ?? []; if (coordSortsReserve.length == 0) { // La queue se transforme en idée fixe const ideeFixe = await RdDRollTables.getIdeeFixe(); diff --git a/module/voyage/dialog-fatigue-voyage.js b/module/voyage/dialog-fatigue-voyage.js index 1ae7bef6..591c1942 100644 --- a/module/voyage/dialog-fatigue-voyage.js +++ b/module/voyage/dialog-fatigue-voyage.js @@ -1,4 +1,4 @@ -import { TYPES } from "../item.js" +import { ITEM_TYPES } from "../item.js" import { RdDItemCompetence } from "../item-competence.js" import { ChatUtility } from "../chat-utility.js" import { Misc } from "../misc.js" @@ -69,7 +69,7 @@ export class DialogFatigueVoyage extends Dialog { } const competencesVoyage = {} CODES_COMPETENCES_VOYAGE.forEach(codeSurvie => { - competencesVoyage[codeSurvie] = RdDItemCompetence.findCompetence(actor.itemTypes[TYPES.competence], codeSurvie, { onMessage: () => { } }) + competencesVoyage[codeSurvie] = RdDItemCompetence.findCompetence(actor.itemTypes[ITEM_TYPES.competence], codeSurvie, { onMessage: () => { } }) }) TABLEAU_FATIGUE_MARCHE.forEach(terrain => { actorParameters.survies[terrain.code] = Misc.join(