diff --git a/module/actor-creature-sheet.js b/module/actor-creature-sheet.js
index 215731aa..dac64737 100644
--- a/module/actor-creature-sheet.js
+++ b/module/actor-creature-sheet.js
@@ -27,8 +27,8 @@ export class RdDActorCreatureSheet extends RdDActorSheet {
/* -------------------------------------------- */
async getData() {
- let formData = await super.getData();
- console.log("Creature : ", formData);
+ let formData = await super.getData()
+ //console.log("Creature : ", formData, formData.system)
formData.calc = {
caracTotal: RdDCarac.computeTotal(formData.data.carac),
resumeBlessures: this.actor.computeResumeBlessure(formData.data.blessures),
diff --git a/module/actor-entite-sheet.js b/module/actor-entite-sheet.js
index 920c4ac5..26905d35 100644
--- a/module/actor-entite-sheet.js
+++ b/module/actor-entite-sheet.js
@@ -22,33 +22,26 @@ export class RdDActorEntiteSheet extends ActorSheet {
});
}
- /* -------------------------------------------- */
- _checkNull(items) {
- if (items && items.length) {
- return items;
- }
- return [];
- }
/* -------------------------------------------- */
async getData() {
const objectData = Misc.data(this.object);
let formData = {
title: this.title,
- id: this.object.id,
- type: this.object.type,
- img: this.object.img,
- name: this.object.name,
+ id: objectData.id,
+ type: objectData.type,
+ img: objectData.img,
+ name: objectData.name,
// actor: this.object,
editable: this.isEditable,
cssClass: this.isEditable ? "editable" : "locked",
- data: foundry.utils.deepClone(Misc.templateData(this.object)),
+ data: foundry.utils.deepClone(this.actor.system),
effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
// items: items,
limited: this.object.limited,
options: this.options,
owner: this.document.isOwner,
- itemsByType: Misc.classify(this.object.items.map(i => foundry.utils.deepClone(i))),
+ itemsByType: Misc.classify(this.object.items.map(i => foundry.utils.deepClone(i.system))),
};
formData.options.isGM = game.user.isGM;
diff --git a/module/actor-sheet.js b/module/actor-sheet.js
index 4e6842d5..6b05672b 100644
--- a/module/actor-sheet.js
+++ b/module/actor-sheet.js
@@ -36,10 +36,9 @@ export class RdDActorSheet extends ActorSheet {
/* -------------------------------------------- */
async getData() {
- const objectData = Misc.data(this.object)
-
- //this.actor.checkMonnaiePresence(this.actor.data.items); // Always check
-
+ const objectData = this.object.system
+
+ console.log("New actor", objectData)
let formData = {
title: this.title,
id: this.object.id,
@@ -48,17 +47,16 @@ export class RdDActorSheet extends ActorSheet {
name: this.object.name,
editable: this.isEditable,
cssClass: this.isEditable ? "editable" : "locked",
- data: foundry.utils.deepClone(this.object.system),
+ data: foundry.utils.deepClone(this.actor.system),
effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
limited: this.object.limited,
options: this.options,
owner: this.document.isOwner,
itemsByType: Misc.classify(this.object.items.map(i => foundry.utils.deepClone(i))),
- };
- console.log("ACTOR DATA:", formData)
-
+ }
+ console.log("BUILD",formData.itemsByType, this.object.items )
RdDUtility.filterItemsPerTypeForSheet(formData)
-
+
formData.options.isGM = game.user.isGM;
if (formData.type == 'creature') return formData; // Shortcut
@@ -79,12 +77,11 @@ export class RdDActorSheet extends ActorSheet {
};
formData.competences.forEach(item => {
- console.log('Comp', item)
- item.isVisible = this.options.cherchercompetence
+ item.system.visible = this.options.cherchercompetence
? RdDItemCompetence.nomContientTexte(item, this.options.cherchercompetence)
: (!this.options.showCompNiveauBase || !RdDItemCompetence.isNiveauBase(item));
- RdDItemCompetence.levelUp(item, formData.data.compteurs.experience.value)
- })
+ RdDItemCompetence.levelUp(item, formData.data.compteurs.experience.value);
+ });
Object.values(formData.data.carac).forEach(c => {
RdDCarac.levelUp(c);
@@ -92,11 +89,11 @@ export class RdDActorSheet extends ActorSheet {
// toujours avoir une liste d'armes (pour mettre esquive et corps à corps)
- formData.combat = duplicate(formData.armes ?? [])
- RdDItemArme.computeNiveauArmes(formData.combat, formData.competences)
- /* TODO TODO RdDItemArme.ajoutCorpsACorps(formData.combat, formData.competences, formData.data.carac)*/
+ formData.combat = duplicate(formData.armes ?? []);
+ RdDItemArme.computeNiveauArmes(formData.combat, formData.competences);
+ RdDItemArme.ajoutCorpsACorps(formData.combat, formData.competences, formData.data.carac);
formData.esquives = this.actor.getCompetences("Esquive").map(i => foundry.utils.deepClone(i.system))
- formData.combat = RdDCombatManager.finalizeArmeList(formData.combat, formData.competences, formData.data.carac)
+ formData.combat = RdDCombatManager.finalizeArmeList(formData.combat, formData.competences, formData.data.carac);
this.armesList = formData.combat;
@@ -169,13 +166,14 @@ export class RdDActorSheet extends ActorSheet {
if (!this.options.editable) return;
html.find('.item-split').click(async event => {
- const item = RdDSheetUtility.getItem(event, this.actor)
- RdDSheetUtility.splitItem(item, this.actor)
+ const item = RdDSheetUtility.getItem(event, this.actor);
+ RdDSheetUtility.splitItem(item, this.actor);
});
html.find('.item-edit').click(async event => {
const item = RdDSheetUtility.getItem(event, this.actor)
+ console.log("ITEM :", item)
item.sheet.render(true)
- });
+ })
html.find('.display-label a').click(async event => {
const item = RdDSheetUtility.getItem(event, this.actor);
item.sheet.render(true);
@@ -197,7 +195,7 @@ export class RdDActorSheet extends ActorSheet {
});
html.find('.item-action').click(async event => {
- const item = RdDSheetUtility.getItem(event, this.actor);
+ const item = RdDSheetUtility.getItem(event, this.actor)
this.actor.actionItem(item);
});
html.find('.subacteur-delete').click(async event => {
@@ -207,8 +205,11 @@ export class RdDActorSheet extends ActorSheet {
html.find('.encaisser-direct').click(async event => {
this.actor.encaisser();
- });
-
+ })
+ html.find('.sheet-possession-attack').click(async event => {
+ const poss = RdDSheetUtility.getItem(event, this.actor)
+ this.actor.conjurerPossession(poss)
+ })
html.find('.remise-a-neuf').click(async event => {
if (game.user.isGM) {
this.actor.remiseANeuf();
@@ -254,7 +255,7 @@ export class RdDActorSheet extends ActorSheet {
// Equip Inventory Item
html.find('.item-equip').click(async event => {
- this.actor.equiperObjet(RdDSheetUtility.getItemId(event))
+ this.actor.equiperObjet(RdDSheetUtility.getItemId(event));
});
// Roll Carac
@@ -326,8 +327,8 @@ export class RdDActorSheet extends ActorSheet {
// Roll Weapon1
html.find('.arme-label a').click(async event => {
- let arme = this._getEventArmeCombat(event)
- this.actor.rollArme(duplicate(arme))
+ let arme = this._getEventArmeCombat(event);
+ this.actor.rollArme(duplicate(arme));
});
// Initiative pour l'arme
html.find('.arme-initiative a').click(async event => {
@@ -387,9 +388,9 @@ export class RdDActorSheet extends ActorSheet {
this.actor.updateCarac(caracName, parseInt(event.target.value));
});
html.find('.carac-xp').change(async event => {
- let caracName = event.currentTarget.name.replace(".xp", "").replace("system.carac.", "")
- //console.log("Value changed :", event, caracName)
- this.actor.updateCaracXP(caracName, parseInt(event.target.value))
+ let caracName = event.currentTarget.name.replace(".xp", "").replace("data.carac.", "");
+ //console.log("Value changed :", event, caracName);
+ this.actor.updateCaracXP(caracName, parseInt(event.target.value));
});
// On competence change
html.find('.competence-value').change(async event => {
@@ -513,17 +514,15 @@ export class RdDActorSheet extends ActorSheet {
});
}
- /* -------------------------------------------- */
_getEventArmeCombat(event) {
- const li = $(event.currentTarget)?.parents(".item")
- let armeName = li.data("arme-name")
- let compName = li.data('competence-name')
- console.log("Searching for", armeName, compName)
- const arme = this.armesList.find(a => a.name == armeName && a.system.competence == compName)
+ const li = $(event.currentTarget)?.parents(".item");
+ let armeName = li.data("arme-name");
+ let compName = li.data('competence-name');
+ const arme = this.armesList.find(a => a.name == armeName && a.data.competence == compName);
if (!arme) {
- return { name: armeName, data: { competence: compName } }
+ return { name: armeName, data: { competence: compName } };
}
- return arme
+ return arme;
}
/* -------------------------------------------- */
@@ -552,9 +551,10 @@ export class RdDActorSheet extends ActorSheet {
}
async _onSplitItem(item, split) {
- if (split >= 1 && split < item.system.quantite) {
- await item.diminuerQuantite(split)
- item.system.quantite = split;
+ if (split >= 1 && split < Misc.data(item).data.quantite) {
+ await item.diminuerQuantite(split);
+ const itemData = duplicate(Misc.data(item));
+ itemData.data.quantite = split;
await this.actor.createEmbeddedDocuments('Item', [itemData])
}
}
diff --git a/module/actor-vehicule-sheet.js b/module/actor-vehicule-sheet.js
index 1d39f106..e6cf1fbc 100644
--- a/module/actor-vehicule-sheet.js
+++ b/module/actor-vehicule-sheet.js
@@ -25,14 +25,6 @@ export class RdDActorVehiculeSheet extends ActorSheet {
});
}
- /* -------------------------------------------- */
- _checkNull(items) {
- if (items && items.length) {
- return items;
- }
- return [];
- }
-
/* -------------------------------------------- */
async getData() {
const objectData = Misc.data(this.object);
@@ -68,6 +60,9 @@ export class RdDActorVehiculeSheet extends ActorSheet {
return formData;
}
+ async computeMalusArmure() {
+ // pas de malus armure
+ }
/* -------------------------------------------- */
async _onDropItem(event, dragData) {
const destItemId = $(event.target)?.closest('.item').attr('data-item-id');
diff --git a/module/actor.js b/module/actor.js
index 1927ffaf..ce4bea75 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -115,18 +115,17 @@ export class RdDActor extends Actor {
return actor;
}
- const competences = await RdDUtility.loadCompendium(RdDItemCompetence.actorCompendium(actorData.type));
- actorData.items = competences.map(i => i.toObject());
+ const competences = await RdDUtility.loadCompendium(RdDItemCompetence.actorCompendium(actorData.type))
+ actorData.items = competences.map(i => i.toObject())
if (isPersonnage) {
actorData.items = actorData.items.concat(Monnaie.monnaiesData());
}
- return super.create(actorData, options);
+ return super.create(actorData, options)
}
/* -------------------------------------------- */
prepareData() {
super.prepareData();
- const actorData = this.system
// Dynamic computing fields
this.encTotal = 0;
@@ -141,9 +140,9 @@ export class RdDActor extends Actor {
// Make separate methods for each Actor type (character, npc, etc.) to keep
// things organized.
- if (actorData.type === 'personnage') this._prepareCharacterData(actorData);
- if (actorData.type === 'creature') this._prepareCreatureData(actorData);
- if (actorData.type === 'vehicule') this._prepareVehiculeData(actorData);
+ if (this.type === 'personnage') this._prepareCharacterData(this)
+ if (this.type === 'creature') this._prepareCreatureData(this)
+ if (this.type === 'vehicule') this._prepareVehiculeData(this)
}
/* -------------------------------------------- */
@@ -173,7 +172,7 @@ export class RdDActor extends Actor {
*/
async _prepareCharacterData(actorData) {
// Initialize empty items
- RdDCarac.computeCarac(actorData.data);
+ RdDCarac.computeCarac(actorData.system)
this.computeIsHautRevant();
await this.cleanupConteneurs();
await this.computeEncombrementTotalEtMalusArmure();
@@ -186,8 +185,8 @@ export class RdDActor extends Actor {
/* -------------------------------------------- */
async cleanupConteneurs() {
let updates = this.listItemsData('conteneur')
- .filter(c => c.data.contenu.filter(id => this.getObjet(id) == undefined).length > 0)
- .map(c => { return { _id: c._id, 'data.contenu': c.data.contenu.filter(id => this.getObjet(id) != undefined) } });
+ .filter(c => c.system.contenu.filter(id => this.getObjet(id) == undefined).length > 0)
+ .map(c => { return { _id: c._id, 'data.contenu': c.system.contenu.filter(id => this.getObjet(id) != undefined) } });
if (updates.length > 0) {
await this.updateEmbeddedDocuments("Item", updates)
}
@@ -213,12 +212,12 @@ export class RdDActor extends Actor {
}
/* -------------------------------------------- */
isHautRevant() {
- return this.isPersonnage() && this.system.attributs.hautrevant.value != ""
+ return this.isPersonnage() && this.attributs.hautrevant.value != ""
}
/* -------------------------------------------- */
getFatigueActuelle() {
if (ReglesOptionelles.isUsing("appliquer-fatigue") && this.isPersonnage()) {
- return Misc.toInt(this.system.sante.fatigue?.value);
+ return this.system.sante.fatigue?.value;
}
return 0;
}
@@ -231,7 +230,7 @@ export class RdDActor extends Actor {
}
/* -------------------------------------------- */
getReveActuel() {
- return Misc.toInt(this.system.reve?.reve?.value ?? this.system.carac.reve.value);
+ return Misc.toInt(this.system.reve?.reve?.value ?? this.carac.reve.value);
}
/* -------------------------------------------- */
getChanceActuel() {
@@ -276,13 +275,12 @@ export class RdDActor extends Actor {
/* -------------------------------------------- */
getEtatGeneral(options = { ethylisme: false }) {
- const tplData = this.system
- let etatGeneral = Misc.toInt(tplData.compteurs.etat?.value);
+ let etatGeneral = Misc.toInt(this.system.compteurs.etat?.value)
if (options.ethylisme) {
// Pour les jets d'Ethylisme, on ignore le degré d'éthylisme (p.162)
- etatGeneral -= Math.min(0, tplData.compteurs.ethylisme.value);
+ etatGeneral -= Math.min(0, this.system.compteurs.ethylisme.value)
}
- return etatGeneral;
+ return etatGeneral
}
/* -------------------------------------------- */
getActivePoisons() {
@@ -291,7 +289,7 @@ export class RdDActor extends Actor {
/* -------------------------------------------- */
getMalusArmure() {
- return Misc.toInt(this.system.attributs?.malusarmure?.value);
+ return Misc.toInt(this.system.attributs?.malusarmure?.value)
}
/* -------------------------------------------- */
@@ -301,16 +299,16 @@ export class RdDActor extends Actor {
/* -------------------------------------------- */
getPrixTotalEquipement() {
- return Math.floor(this.system.prixTotalEquipement ?? 0);
+ return Math.floor(this.system.prixTotalEquipement ?? 0)
}
/* -------------------------------------------- */
getCompetence(idOrName, options = {}) {
- return RdDItemCompetence.findCompetence(this.items, idOrName, options);
+ return RdDItemCompetence.findCompetence(this.items, idOrName, options)
}
getCompetences(name) {
- return RdDItemCompetence.findCompetences(this.items, name);
+ return RdDItemCompetence.findCompetences(this.items, name)
}
/* -------------------------------------------- */
@@ -322,10 +320,10 @@ export class RdDActor extends Actor {
return this.filterItemsData(it => it.type == type);
}
filterItemsData(filter) {
- return this.items.map(it => it).filter(filter)
+ return this.items.map( it => it).filter(filter)
}
filterItems(filter) {
- return this.items.filter(it => filter(Misc.data(it)))
+ return this.items.filter(it => filter(it))
}
getItemOfType(idOrName, type) {
@@ -369,13 +367,12 @@ export class RdDActor extends Actor {
/* -------------------------------------------- */
getBestDraconic() {
const list = this.getDraconicList()
- console.log("Draco", list)
return duplicate(list[0])
}
getDraconicOrZero() {
- const list = this.getDraconicList().filter(it => Misc.data(it).data.niveau >= 0);
+ const list = this.getDraconicList().filter(it => it.system.niveau >= 0);
if (list.length == 0) {
- return { name: "Aucun", data: { niveau: 0 } };
+ return { name: "Aucun", system: { niveau: 0 } };
}
return duplicate(list[0]);
}
@@ -386,11 +383,11 @@ export class RdDActor extends Actor {
/* -------------------------------------------- */
async verifierPotionsEnchantees() {
- let potionsEnchantees = this.filterItemsData(it => it.type == 'potion' && it.data.categorie.toLowerCase().includes('enchant'));
+ let potionsEnchantees = this.filterItemsData(it => it.type == 'potion' && it.system.categorie.toLowerCase().includes('enchant'));
for (let potion of potionsEnchantees) {
- if (!potion.data.prpermanent) {
+ if (!potion.system.prpermanent) {
console.log(potion);
- let newPr = (potion.data.pr > 0) ? potion.data.pr - 1 : 0;
+ let newPr = (potion.system.pr > 0) ? potion.system.pr - 1 : 0;
let update = { _id: potion._id, 'data.pr': newPr };
const updated = await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
@@ -471,7 +468,7 @@ export class RdDActor extends Actor {
content: ""
};
- const blessures = duplicate(this.system.blessures);
+ const blessures = duplicate(this.system.blessures)
await this._recupererBlessures(message, "legere", blessures.legeres.liste.filter(b => b.active), []);
await this._recupererBlessures(message, "grave", blessures.graves.liste.filter(b => b.active), blessures.legeres.liste);
await this._recupererBlessures(message, "critique", blessures.critiques.liste.filter(b => b.active), blessures.graves.liste);
@@ -556,7 +553,7 @@ export class RdDActor extends Actor {
/* -------------------------------------------- */
async _recupererVie(message) {
- const tData = this.system
+ const tData = Misc.templateData(this);
let blessures = [].concat(tData.blessures.legeres.liste).concat(tData.blessures.graves.liste).concat(tData.blessures.critiques.liste);
let nbBlessures = blessures.filter(b => b.active);
let vieManquante = tData.sante.vie.max - tData.sante.vie.value;
@@ -583,7 +580,7 @@ export class RdDActor extends Actor {
/* -------------------------------------------- */
async _jetRecuperationConstitution(bonusSoins, message = undefined) {
- const tData = this.system
+ const tData = Misc.templateData(this);
let difficulte = Misc.toInt(bonusSoins) + Math.min(0, tData.sante.vie.value - tData.sante.vie.max);
let rolled = await RdDResolutionTable.roll(tData.carac.constitution.value, difficulte);
if (message) {
@@ -671,7 +668,7 @@ export class RdDActor extends Actor {
/* -------------------------------------------- */
async _recupererEthylisme(message) {
- let ethylisme = duplicate(this.system.compteurs.ethylisme);
+ let ethylisme = duplicate(Misc.templateData(this).compteurs.ethylisme);
ethylisme.nb_doses = 0;
ethylisme.jet_moral = false;
if (ethylisme.value < 1) {
@@ -685,7 +682,7 @@ export class RdDActor extends Actor {
/* -------------------------------------------- */
async recupereEndurance(message) {
- const manquant = this._computeEnduranceMax() - this.system.sante.endurance.value;
+ const manquant = this._computeEnduranceMax() - Misc.templateData(this).sante.endurance.value;
if (manquant > 0) {
await this.santeIncDec("endurance", manquant);
message.content += "Vous récuperez " + manquant + " points d'endurance. ";
@@ -695,7 +692,7 @@ export class RdDActor extends Actor {
/* -------------------------------------------- */
async recupererFatigue(message) {
if (ReglesOptionelles.isUsing("appliquer-fatigue")) {
- let fatigue = this.system.sante.fatigue.value;
+ let fatigue = Misc.templateData(this).sante.fatigue.value;
const fatigueMin = this._computeFatigueMin();
if (fatigue <= fatigueMin) {
return;
@@ -710,7 +707,7 @@ export class RdDActor extends Actor {
/* -------------------------------------------- */
_calculRecuperationSegment(actuel) {
- const segments = RdDUtility.getSegmentsFatigue(this.system.sante.endurance.max);
+ const segments = RdDUtility.getSegmentsFatigue(Misc.templateData(this).sante.endurance.max);
let cumul = 0;
let i;
for (i = 0; i < 11; i++) {
@@ -730,7 +727,7 @@ export class RdDActor extends Actor {
/* -------------------------------------------- */
async recuperationReve(message) {
- const seuil = this.system.reve.seuil.value;
+ const seuil = Misc.templateData(this).reve.seuil.value;
const reveActuel = this.getReveActuel();
if (reveActuel < seuil) {
let deRecuperation = await RdDDice.rollTotal("1dr");
@@ -751,7 +748,7 @@ export class RdDActor extends Actor {
/* -------------------------------------------- */
async retourSeuilDeReve(message) {
- const seuil = this.system.reve.seuil.value;
+ const seuil = Misc.templateData(this).reve.seuil.value;
const reveActuel = this.getReveActuel();
if (reveActuel > seuil) {
message.content += `une seule cible à posséder!"
@@ -112,13 +139,16 @@ export class RdDPossession {
return;
}
- const defender = target.actor;
- let possession = this.searchPossessionFromEntite( attacker, defender);
+ const defender = target.actor
if ( !possession) {
- possession = this.createPossession(attacker, defender);
+ possession = this.searchPossessionFromEntite( attacker, defender)
+ if ( !possession) {
+ possession = await this.createPossession(attacker, defender)
+ }
}
+ possession = duplicate(possession)
- this.updateEtatPossession(possession);
+ this.updateEtatPossession(possession)
let rollData = {
competence: competence,
possession: possession,
@@ -129,9 +159,8 @@ export class RdDPossession {
mode: "possession"
};
if ( attacker.isCreature()) {
- RdDItemCompetenceCreature.setRollDataCreature(rollData);
+ RdDItemCompetenceCreature.setRollDataCreature(rollData)
}
- console.log("Creation de possession2", attacker, rollData);
const dialog = await RdDRoll.create( attacker, rollData,
{
@@ -145,19 +174,19 @@ export class RdDPossession {
{ condition: r => (r.rolled.isEchec), action: async r => await this._onRollPossession(r, false) },
]
});
- dialog.render(true);
+ dialog.render(true)
}
/* -------------------------------------------- */
static async createPossession( attacker, defender ) {
- let posessionData = {
- name: "Possession en cours", type: 'possession',
+ let possessionData = {
+ name: "Possession en cours de " + attacker.name, type: 'possession',
img: "systems/foundryvtt-reve-de-dragon/icons/entites/possession2.webp",
- data: { description: "", possede: false, possessionid: randomID(16), possesseurid: attacker.data._id, possedeid: defender.data._id, date: 0 }
+ data: { description: "", typepossession: attacker.name, possede: false, possessionid: randomID(16), possesseurid: attacker.data._id, possedeid: defender.data._id, date: 0, compteur: 0 }
}
- await attacker.createEmbeddedDocuments('Item', [posessionData])
- let poss = await defender.createEmbeddedDocuments('Item', [posessionData])
- return duplicate(poss[0]);
+ // Creates only the possession on the personnage side
+ let poss = await defender.createEmbeddedDocuments('Item', [possessionData])
+ return duplicate(poss[0])
}
}
\ No newline at end of file
diff --git a/module/rdd-roll.js b/module/rdd-roll.js
index 4ed55155..3bc8d238 100644
--- a/module/rdd-roll.js
+++ b/module/rdd-roll.js
@@ -38,18 +38,19 @@ export class RdDRoll extends Dialog {
/* -------------------------------------------- */
static _setDefaultOptions(actor, rollData) {
+ const actorData = actor.system
let defaultRollData = {
alias: actor.name,
ajustementsConditions: CONFIG.RDD.ajustementsConditions,
difficultesLibres: CONFIG.RDD.difficultesLibres,
etat: actor.getEtatGeneral(),
moral: actor.getMoralTotal(), /* La valeur du moral pour les jets de volonté */
- carac: actor.system.carac,
+ carac: actorData.carac,
finalLevel: 0,
diffConditions: 0,
diffLibre: rollData.competence?.system.default_diffLibre ?? 0,
malusArmureValue: actor.getMalusArmure(),
- surencMalusFlag: actor.isPersonnage() ? (actor.system.compteurs.surenc.value < 0) : false,
+ surencMalusFlag: actor.isPersonnage() ? (actorData.compteurs.surenc.value < 0) : false,
surencMalusValue: actor.computeMalusSurEncombrement(),
useMalusSurenc: false,
useMoral: false, /* Est-ce que le joueur demande d'utiliser le moral ? Utile si le joueur change plusieurs fois de carac associée. */
@@ -63,7 +64,11 @@ export class RdDRoll extends Dialog {
canClose: true,
isGM: game.user.isGM,
forceDiceResult: -1
- };
+ }
+ // Mini patch :Ajout du rêve actuel
+ if ( actorData.type == "personnage") {
+ defaultRollData.carac["reve-actuel"] = actorData.reve.reve
+ }
mergeObject(rollData, defaultRollData, { recursive: true, overwrite: false });
if (rollData.forceCarac) {
@@ -73,7 +78,6 @@ export class RdDRoll extends Dialog {
RollDataAjustements.calcul(rollData, actor);
}
-
/* -------------------------------------------- */
static getDiviseurSignificative(rollData) {
let facteurSign = 1;
@@ -166,12 +170,12 @@ export class RdDRoll extends Dialog {
if (rollData.competence) {
const defaut_carac = rollData.competence.system.defaut_carac
// Set the default carac from the competence item
- rollData.selectedCarac = rollData.carac[defaut_carac]
- $("#carac").val(defaut_carac)
+ rollData.selectedCarac = rollData.carac[defaut_carac];
+ $("#carac").val(defaut_carac);
}
if (rollData.selectedSort) {
- dialog.setSelectedSort(rollData.selectedSort)
- $(".draconic").val(rollData.selectedSort.data.listIndex) // Uniquement a la selection du sort, pour permettre de changer
+ dialog.setSelectedSort(rollData.selectedSort);
+ $(".draconic").val(rollData.selectedSort.system.listIndex); // Uniquement a la selection du sort, pour permettre de changer
}
RdDItemSort.setCoutReveReel(rollData.selectedSort);
$("#diffLibre").val(Misc.toInt(rollData.diffLibre));
@@ -267,47 +271,47 @@ export class RdDRoll extends Dialog {
async setSelectedSort(sort) {
this.rollData.selectedSort = sort; // Update the selectedCarac
- this.rollData.competence = RdDItemCompetence.getVoieDraconic(this.rollData.draconicList, sort.data.draconic);
+ this.rollData.competence = RdDItemCompetence.getVoieDraconic(this.rollData.draconicList, sort.system.draconic);
this.rollData.bonus = RdDItemSort.getCaseBonus(sort, this.rollData.tmr.coord);
this.rollData.diffLibre = RdDItemSort.getDifficulte(sort, -7);
RdDItemSort.setCoutReveReel(sort);
const htmlSortDescription = await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/partial-description-sort.html", { sort: sort });
- $(".sort-ou-rituel").text(sort.data.isrituel ? "rituel" : "sort");
+ $(".sort-ou-rituel").text(sort.system.isrituel ? "rituel" : "sort");
$(".bonus-case").text(`${this.rollData.bonus}%`);
$(".details-sort").remove();
$(".description-sort").append(htmlSortDescription);
- $(".roll-draconic").val(sort.data.listIndex);
- $(".div-sort-difficulte-fixe").text(Misc.toSignedString(sort.data.difficulte));
- $(".div-sort-ptreve-fixe").text(sort.data.ptreve);
+ $(".roll-draconic").val(sort.system.listIndex);
+ $(".div-sort-difficulte-fixe").text(Misc.toSignedString(sort.system.difficulte));
+ $(".div-sort-ptreve-fixe").text(sort.system.ptreve);
const diffVariable = RdDItemSort.isDifficulteVariable(sort);
const coutVariable = RdDItemSort.isCoutVariable(sort);
- HtmlUtility._showControlWhen($(".div-sort-non-rituel"), !sort.data.isrituel);
+ HtmlUtility._showControlWhen($(".div-sort-non-rituel"), !sort.system.isrituel);
HtmlUtility._showControlWhen($(".div-sort-difficulte-var"), diffVariable);
HtmlUtility._showControlWhen($(".div-sort-difficulte-fixe"), !diffVariable);
HtmlUtility._showControlWhen($(".div-sort-ptreve-var"), coutVariable);
HtmlUtility._showControlWhen($(".div-sort-ptreve-fixe"), !coutVariable);
}
- async setSelectedSigneDraconique(signe) {
+ async setSelectedSigneDraconique(signe){
this.rollData.signe = signe;
- this.rollData.diffLibre = Misc.data(signe).data.difficulte,
- $(".signe-difficulte").text(Misc.toSignedString(this.rollData.diffLibre));
+ this.rollData.diffLibre = Misc.data(signe).data.difficulte,
+ $(".signe-difficulte").text(Misc.toSignedString(this.rollData.diffLibre));
}
/* -------------------------------------------- */
async updateRollResult() {
let rollData = this.rollData;
- rollData.dmg = rollData.attackerRoll?.dmg ?? RdDBonus.dmg(rollData, this.actor.getBonusDegat());
- rollData.caracValue = parseInt(rollData.selectedCarac.value);
+ rollData.dmg = rollData.attackerRoll?.dmg ?? RdDBonus.dmg(rollData, this.actor.getBonusDegat())
+ rollData.caracValue = parseInt(rollData.selectedCarac.value)
rollData.mortalite = rollData.attackerRoll?.dmg.mortalite ?? rollData.dmg.mortalite ?? 'mortel';
rollData.coupsNonMortels = (rollData.attackerRoll?.dmg.mortalite ?? rollData.dmg.mortalite) == 'non-mortel';
rollData.use.appelAuMoral = this.actor.isPersonnage() && RdDCarac.isActionPhysique(rollData.selectedCarac);
let dmgText = Misc.toSignedString(rollData.dmg.total);
- switch (rollData.mortalite) {
- case 'non-mortel': dmgText = `(${dmgText}) non-mortel`; break;
- case 'empoignade': dmgText = `empoignade`; break;
+ switch (rollData.mortalite){
+ case 'non-mortel': dmgText = `(${dmgText}) non-mortel`; break;
+ case 'empoignade': dmgText = `empoignade`; break;
}
RollDataAjustements.calcul(rollData, this.actor);
@@ -339,7 +343,7 @@ export class RdDRoll extends Dialog {
/* -------------------------------------------- */
_computeFinalLevel(rollData) {
- return RollDataAjustements.sum(rollData.ajustements)
+ return RollDataAjustements.sum(rollData.ajustements);
}
/* -------------------------------------------- */
_computeDiffCompetence(rollData) {
@@ -375,13 +379,13 @@ export class RdDRoll extends Dialog {
/* -------------------------------------------- */
_getTitle(rollData) {
- const carac = rollData.selectedCarac.label
+ const carac = rollData.selectedCarac.label;
if (!rollData.competence) {
- return carac
+ return carac;
}
- const compName = rollData.competence.name
+ const compName = rollData.competence.name;
if (rollData.draconicList && rollData.selectedSort) {
- return compName + " - " + rollData.selectedSort.name
+ return compName + " - " + rollData.selectedSort.name;
}
// If a weapon is there, add it in the title
const niveau = Misc.toSignedString(rollData.competence.system.niveau)
diff --git a/module/rdd-sheet-utility.js b/module/rdd-sheet-utility.js
index fa114829..22555a7f 100644
--- a/module/rdd-sheet-utility.js
+++ b/module/rdd-sheet-utility.js
@@ -4,7 +4,7 @@ import { Misc } from "./misc.js";
export class RdDSheetUtility {
static getItem(event, actor) {
- return actor.items.get(RdDSheetUtility.getItemId(event));
+ return actor.items.get(RdDSheetUtility.getItemId(event))
}
static getItemId(event) {
@@ -21,7 +21,7 @@ export class RdDSheetUtility {
}
static prepareItemDropParameters(destItemId, actorId, dragData, objetVersConteneur) {
- const itemId = dragData.id || dragData._id
+ const itemId = dragData.id || dragData.data._id
return {
destId: destItemId,
targetActorId: actorId,
diff --git a/module/rdd-utility.js b/module/rdd-utility.js
index 1831720c..8309d9f8 100644
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -147,6 +147,7 @@ export class RdDUtility {
'systems/foundryvtt-reve-de-dragon/templates/item-meditation-sheet.html',
'systems/foundryvtt-reve-de-dragon/templates/item-nourritureboisson-sheet.html',
'systems/foundryvtt-reve-de-dragon/templates/item-signedraconique-sheet.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/item-possession-sheet.html',
'systems/foundryvtt-reve-de-dragon/templates/competence-carac-defaut.html',
'systems/foundryvtt-reve-de-dragon/templates/competence-base.html',
'systems/foundryvtt-reve-de-dragon/templates/enum-aspect-tarot.html',
@@ -325,8 +326,8 @@ export class RdDUtility {
}
/* -------------------------------------------- */
- static checkNull(items) {
- if (items && items.length) {
+ static arrayOrEmpty(items) {
+ if (items?.length) {
return items;
}
return [];
@@ -359,44 +360,44 @@ export class RdDUtility {
RdDUtility.filterEquipementParType(formData);
- formData.sorts = this.checkNull(formData.itemsByType['sort']);
- formData.signesdraconiques = this.checkNull(formData.itemsByType['signedraconique']);
- formData.queues = this.checkNull(formData.itemsByType['queue']);
- formData.souffles = this.checkNull(formData.itemsByType['souffle']);
- formData.ombres = this.checkNull(formData.itemsByType['ombre']);
- formData.tetes = this.checkNull(formData.itemsByType['tete']);
- formData.taches = this.checkNull(formData.itemsByType['tache']);
- formData.meditations = this.checkNull(formData.itemsByType['meditation']);
- formData.chants = this.checkNull(formData.itemsByType['chant']);
- formData.danses = this.checkNull(formData.itemsByType['danse']);
- formData.musiques = this.checkNull(formData.itemsByType['musique']);
- formData.oeuvres = this.checkNull(formData.itemsByType['oeuvre']);
- formData.jeux = this.checkNull(formData.itemsByType['jeu']);
+ formData.sorts = this.arrayOrEmpty(formData.itemsByType['sort']);
+ formData.signesdraconiques = this.arrayOrEmpty(formData.itemsByType['signedraconique']);
+ formData.queues = this.arrayOrEmpty(formData.itemsByType['queue']);
+ formData.souffles = this.arrayOrEmpty(formData.itemsByType['souffle']);
+ formData.ombres = this.arrayOrEmpty(formData.itemsByType['ombre']);
+ formData.tetes = this.arrayOrEmpty(formData.itemsByType['tete']);
+ formData.taches = this.arrayOrEmpty(formData.itemsByType['tache']);
+ formData.meditations = this.arrayOrEmpty(formData.itemsByType['meditation']);
+ formData.chants = this.arrayOrEmpty(formData.itemsByType['chant']);
+ formData.danses = this.arrayOrEmpty(formData.itemsByType['danse']);
+ formData.musiques = this.arrayOrEmpty(formData.itemsByType['musique']);
+ formData.oeuvres = this.arrayOrEmpty(formData.itemsByType['oeuvre']);
+ formData.jeux = this.arrayOrEmpty(formData.itemsByType['jeu']);
- formData.recettescuisine = this.checkNull(formData.itemsByType['recettecuisine']);
- formData.recettesAlchimiques = this.checkNull(formData.itemsByType['recettealchimique']);
- formData.maladies = this.checkNull(formData.itemsByType['maladie']);
- formData.poisons = this.checkNull(formData.itemsByType['poison']);
- formData.possessions = this.checkNull(formData.itemsByType['possession']);
+ formData.recettescuisine = this.arrayOrEmpty(formData.itemsByType['recettecuisine']);
+ formData.recettesAlchimiques = this.arrayOrEmpty(formData.itemsByType['recettealchimique']);
+ formData.maladies = this.arrayOrEmpty(formData.itemsByType['maladie']);
+ formData.poisons = this.arrayOrEmpty(formData.itemsByType['poison']);
+ formData.possessions = this.arrayOrEmpty(formData.itemsByType['possession']);
formData.maladiesPoisons = formData.maladies.concat(formData.poisons);
formData.competences = (formData.itemsByType.competence ?? []).concat(formData.itemsByType.competencecreature ?? []);
}
static filterEquipementParType(formData) {
- formData.conteneurs = this.checkNull(formData.itemsByType['conteneur']);
+ formData.conteneurs = this.arrayOrEmpty(formData.itemsByType['conteneur']);
- formData.materiel = this.checkNull(formData.itemsByType['objet']);
- formData.armes = this.checkNull(formData.itemsByType['arme']);
- formData.armures = this.checkNull(formData.itemsByType['armure']);
- formData.munitions = this.checkNull(formData.itemsByType['munition']);
- formData.livres = this.checkNull(formData.itemsByType['livre']);
- formData.potions = this.checkNull(formData.itemsByType['potion']);
- formData.ingredients = this.checkNull(formData.itemsByType['ingredient']);
- formData.herbes = this.checkNull(formData.itemsByType['herbe']);
- formData.monnaie = this.checkNull(formData.itemsByType['monnaie']);
+ formData.materiel = this.arrayOrEmpty(formData.itemsByType['objet']);
+ formData.armes = this.arrayOrEmpty(formData.itemsByType['arme']);
+ formData.armures = this.arrayOrEmpty(formData.itemsByType['armure']);
+ formData.munitions = this.arrayOrEmpty(formData.itemsByType['munition']);
+ formData.livres = this.arrayOrEmpty(formData.itemsByType['livre']);
+ formData.potions = this.arrayOrEmpty(formData.itemsByType['potion']);
+ formData.ingredients = this.arrayOrEmpty(formData.itemsByType['ingredient']);
+ formData.herbes = this.arrayOrEmpty(formData.itemsByType['herbe']);
+ formData.monnaie = this.arrayOrEmpty(formData.itemsByType['monnaie']);
formData.monnaie.sort(Monnaie.triValeurDenier());
- formData.nourritureboissons = this.checkNull(formData.itemsByType['nourritureboisson']);
- formData.gemmes = this.checkNull(formData.itemsByType['gemme']);
+ formData.nourritureboissons = this.arrayOrEmpty(formData.itemsByType['nourritureboisson']);
+ formData.gemmes = this.arrayOrEmpty(formData.itemsByType['gemme']);
formData.objets = formData.conteneurs
.concat(formData.materiel)
@@ -414,40 +415,40 @@ export class RdDUtility {
/* -------------------------------------------- */
static buildArbreDeConteneurs(conteneurs, objets) {
- let objetVersConteneur = {}
+ let objetVersConteneur = {};
// Attribution des objets aux conteneurs
for (let conteneur of conteneurs) {
- conteneur.subItems = []
+ conteneur.subItems = [];
for (let id of conteneur.system.contenu ?? []) {
- let objet = objets.find(objet => (id == objet._id))
+ let objet = objets.find(objet => (id == objet._id));
if (objet) {
objet.estContenu = true; // Permet de filtrer ce qui est porté dans le template
- objetVersConteneur[id] = conteneur._id
- conteneur.subItems.push(objet)
+ objetVersConteneur[id] = conteneur._id;
+ conteneur.subItems.push(objet);
}
}
}
for (let conteneur of conteneurs) {
- conteneur.system.encTotal = RdDUtility.calculEncContenu(conteneur, objets)
+ conteneur.system.encTotal = RdDUtility.calculEncContenu(conteneur, objets);
}
- return objetVersConteneur
+ return objetVersConteneur;
}
/* -------------------------------------------- */
static calculEncContenu(conteneur, objets) {
const contenuDatas = (conteneur.system.contenu ?? []).filter(id => id != undefined)
- .map(id => objets.find(it => (id == it._id)) )
- .filter(it => it)
- let enc = Number(conteneur.system.encombrement ?? 0) * Number(conteneur.system.quantite ?? 1)
- for (let subContenu of contenuDatas) {
- if (subContenu.type == 'conteneur') {
- enc += RdDUtility.calculEncContenu(subContenu, objets)
+ .map(id => Misc.data(objets.find(it => (id == it._id))))
+ .filter(it => it);
+ let enc = Number(conteneur.system.encombrement ?? 0) * Number(conteneur.system.quantite ?? 1);
+ for (let itemData of contenuDatas) {
+ if (itemData.type == 'conteneur') {
+ enc += RdDUtility.calculEncContenu(itemData, objets);
}
else {
- enc += Number(subContenu.system.encombrement ?? 0) * Number(subContenu.system.quantite ?? 1)
+ enc += Number(itemData.system.encombrement ?? 0) * Number(itemData.system.quantite ?? 1)
}
}
- return enc;
+ return enc
}
/* -------------------------------------------- */
@@ -472,6 +473,7 @@ export class RdDUtility {
return str;
}
+ /* -------------------------------------------- */
static buildContenu(objet, niveau, afficherContenu) {
if (!niveau) niveau = 1;
objet.niveau = niveau;
@@ -691,9 +693,10 @@ export class RdDUtility {
// gestion bouton tchat Acheter
html.on("click", '.defense-possession', event => {
- let actorId = event.currentTarget.attributes['data-defenderId'].value;
- let possessionId = event.currentTarget.attributes['data-possessionId'].value;
- RdDPossession.onDefensePossession(actorId, possessionId);
+ let attackerId = event.currentTarget.attributes['data-attackerId'].value
+ let defenderId = event.currentTarget.attributes['data-defenderId'].value
+ let possessionId = event.currentTarget.attributes['data-possessionId'].value
+ RdDPossession.onDefensePossession(attackerId, defenderId, possessionId)
});
// gestion bouton tchat Acheter
diff --git a/module/rolldata-ajustements.js b/module/rolldata-ajustements.js
index 6263eb05..783d9424 100644
--- a/module/rolldata-ajustements.js
+++ b/module/rolldata-ajustements.js
@@ -19,9 +19,9 @@ import { ReglesOptionelles } from "./regles-optionelles.js";
*/
export const referenceAjustements = {
competence: {
- isUsed: (rollData, actor) => rollData.competence,
- getLabel: (rollData, actor) => rollData.competence?.name,
- getValue: (rollData, actor) => rollData.competence?.system.niveau,
+ isUsed: (rollData, actor) => Misc.data(rollData.competence),
+ getLabel: (rollData, actor) => Misc.data(rollData.competence)?.name,
+ getValue: (rollData, actor) => Misc.data(rollData.competence)?.system?.niveau,
},
meditation: {
isUsed: (rollData, actor) => rollData.meditation,
@@ -33,7 +33,7 @@ export const referenceAjustements = {
getLabel: (rollData, actor) => rollData.selectedSort?.name ?? rollData.attackerRoll ? 'Imposée' : 'Libre',
getValue: (rollData, actor) => rollData.selectedSort
? RdDItemSort.getDifficulte(rollData.selectedSort, rollData.diffLibre)
- : rollData.diffLibre ?? rollData.competence?.system.default_diffLibre ?? 0
+ : rollData.diffLibre ?? Misc.data(rollData.competence)?.data.default_diffLibre ?? 0
},
diffConditions: {
isUsed: (rollData, actor) => rollData.diffConditions != undefined,
@@ -95,10 +95,10 @@ export const referenceAjustements = {
getDescr: (rollData, actor) => rollData.diviseurSignificative > 1 ? `Facteur significative ×${Misc.getFractionHtml(rollData.diviseurSignificative)} ` : ''
},
isEcaille: {
- isVisible: (rollData, actor) => rollData.arme?.data.magique && Number(rollData.arme?.data.ecaille_efficacite) > 0,
- isUsed: (rollData, actor) => rollData.arme?.data.magique && Number(rollData.arme?.data.ecaille_efficacite) > 0,
+ isVisible: (rollData, actor) => Misc.data(rollData.arme)?.system.magique && Number(Misc.data(rollData.arme)?.system.ecaille_efficacite) > 0,
+ isUsed: (rollData, actor) => Misc.data(rollData.arme)?.system.magique && Number(Misc.data(rollData.arme)?.system.ecaille_efficacite) > 0,
getLabel: (rollData, actor) => "Ecaille d'Efficacité: ",
- getValue: (rollData, actor) => Math.max(Number(rollData.arme?.data.ecaille_efficacite), 0),
+ getValue: (rollData, actor) => Math.max(Number(Misc.data(rollData.arme)?.system.ecaille_efficacite), 0),
},
finesse: {
isUsed: (rollData, actor) => RdDBonus.isDefenseAttaqueFinesse(rollData),
diff --git a/module/tmr-utility.js b/module/tmr-utility.js
index cebf8e83..81829b71 100644
--- a/module/tmr-utility.js
+++ b/module/tmr-utility.js
@@ -2,7 +2,6 @@ import { TMRRencontres } from "./tmr-rencontres.js";
import { Misc } from "./misc.js";
import { Grammar } from "./grammar.js";
import { RdDDice } from "./rdd-dice.js";
-import { tmrConstants } from "./tmr-constants.js";
/* -------------------------------------------- */
const TMRMapping = {
@@ -12,7 +11,7 @@ const TMRMapping = {
D1: { type: "fleuve", label: "Fleuve de l'Oubli" },
E1: { type: "monts", label: "Monts de Kanaï" },
F1: { type: "cite", label: "Cité Glauque" },
- G1: { type: "desolation", label: "Désolation de Demain" },
+ G1: { type: "desolation", label: "Désolation de Jamais" },
H1: { type: "lac", label: "Lac d’Anticalme" },
I1: { type: "plaines", label: "Plaines Grises" },
J1: { type: "monts", label: "Monts Fainéants" },
@@ -70,7 +69,7 @@ const TMRMapping = {
F5: { type: "cite", label: "Cité de Panople" },
G5: { type: "pont", label: "Pont d’Ik" },
H5: { type: "desert", label: "Désert de Krane" },
- I5: { type: "desolation", label: "Désolation de Demain" },
+ I5: { type: "desolation", label: "Désolation de Toujours" },
J5: { type: "marais", label: "Marais de Jab" },
K5: { type: "fleuve", label: "Fleuve de l'Oubli" },
L5: { type: "collines", label: "Collines Suaves" },
@@ -86,9 +85,9 @@ const TMRMapping = {
H6: { type: "monts", label: "Monts Gurdes" },
I6: { type: "necropole", label: "Nécropole de Xotar" },
J6: { type: "lac", label: "Lac d’Iaupe" },
- K6: { type: "desolation", label: "Désolation de Demain" },
+ K6: { type: "desolation", label: "Désolation de Poor" },
L6: { type: "foret", label: "Forêt Gueuse" },
- M6: { type: "desolation", label: "Désolation de Demain" },
+ M6: { type: "desolation", label: "Désolation de Presque" },
A7: { type: "plaines", label: "Plaines de l’Arc" },
B7: { type: "marais", label: "Marais Bluants" },
@@ -124,7 +123,7 @@ const TMRMapping = {
D9: { type: "pont", label: "Pont d’Orx" },
E9: { type: "fleuve", label: "Fleuve de l'Oubli" },
F9: { type: "plaines", label: "Plaines de Foe" },
- G9: { type: "desolation", label: "Désolation de Demain" },
+ G9: { type: "desolation", label: "Désolation de Sel" },
H9: { type: "collines", label: "Collines de Noirseul" },
I9: { type: "fleuve", label: "Fleuve de l'Oubli" },
J9: { type: "marais", label: "Marais Gronchants" },
@@ -146,10 +145,10 @@ const TMRMapping = {
L10: { type: "desert", label: "Désert de Nicrop" },
M10: { type: "foret", label: "Forêt de Jajou" },
- A11: { type: "desolation", label: "Désolation de Demain" },
+ A11: { type: "desolation", label: "Désolation d’Hier" },
B11: { type: "cite", label: "Cité de Brilz" },
C11: { type: "pont", label: "Pont de Roï" },
- D11: { type: "desolation", label: "Désolation de Demain" },
+ D11: { type: "desolation", label: "Désolation de Partout" },
E11: { type: "lac", label: "Lac de Glinster" },
F11: { type: "cite", label: "Cité de Noape" },
G11: { type: "fleuve", label: "Fleuve de l'Oubli" },
@@ -170,7 +169,7 @@ const TMRMapping = {
H12: { type: "collines", label: "Collines de Tooth" },
I12: { type: "gouffre", label: "Gouffre Abimeux" },
J12: { type: "cite", label: "Cité Folle" },
- K12: { type: "desolation", label: "Désolation de Demain" },
+ K12: { type: "desolation", label: "Désolation d’Amour" },
L12: { type: "plaines", label: "Plaines Venteuses" },
M12: { type: "collines", label: "Collines Révulsantes" },
@@ -181,7 +180,7 @@ const TMRMapping = {
E13: { type: "plaines", label: "Plaines de Xnez" },
F13: { type: "foret", label: "Forêt des Cris" },
G13: { type: "plaines", label: "Plaines Calcaires" },
- H13: { type: "desolation", label: "Désolation de Demain" },
+ H13: { type: "desolation", label: "Désolation de Rien" },
I13: { type: "monts", label: "Monts Bigleux" },
J13: { type: "gouffre", label: "Gouffre de Gromph" },
K13: { type: "foret", label: "Forêt de Kluth" },
@@ -200,8 +199,8 @@ const TMRMapping = {
J14: { type: "desert", label: "Désert de Sank" },
K14: { type: "necropole", label: "Nécropole d’Antinéar" },
L14: { type: "plaines", label: "Plaines de Jislith" },
- M14: { type: "desolation", label: "Désolation de Demain" },
-
+ M14: { type: "desolation", label: "Désolation d’Après" },
+
A15: { type: "cite", label: "Cité de Mielh" },
C15: { type: "plaines", label: "Plaines de Toué" },
E15: { type: "foret", label: "Forêt des Furies" },
diff --git a/module/tmr/effets-draconiques.js b/module/tmr/effets-draconiques.js
index 7236b40c..4d6463f6 100644
--- a/module/tmr/effets-draconiques.js
+++ b/module/tmr/effets-draconiques.js
@@ -16,7 +16,7 @@ import { Conquete } from "./conquete.js";
import { Pelerinage } from "./pelerinage.js";
import { Periple } from "./periple.js";
import { UrgenceDraconique } from "./urgence-draconique.js";
-import { Misc } from "../misc.js";
+import { Grammar } from "../grammar.js";
export class EffetsDraconiques {
@@ -111,36 +111,42 @@ export class EffetsDraconiques {
);
}
+ static filterItems(actor, filter, name) {
+ return actor.data.items.filter(filter)
+ .filter(it => Grammar.includesLowerCaseNoAccent(it.name, name));
+ }
+
static isDonDoubleReve(actor) {
- return actor.data.items.find(it => Draconique.isTeteDragon(it) && it.name == 'Don de double-rêve');
+ return EffetsDraconiques.filterItems(actor, Draconique.isTeteDragon, 'Don de double-rêve').length>0;
}
static isConnaissanceFleuve(actor) {
- return actor.data.items.find(it => Draconique.isTeteDragon(it) && it.name.toLowerCase().includes('connaissance du fleuve'));
+ return EffetsDraconiques.filterItems(actor, Draconique.isTeteDragon, 'connaissance du fleuve').length>0;
}
static isReserveEnSecurite(actor) {
- return actor.data.items.find(it => Draconique.isTeteDragon(it) && it.name.toLowerCase().includes(' en sécurité'));
+ return EffetsDraconiques.filterItems(actor, Draconique.isTeteDragon, 'réserve en sécurité').length>0;
}
static isDeplacementAccelere(actor) {
- return actor.data.items.find(it => Draconique.isTeteDragon(it) && it.name.toLowerCase().includes(' déplacement accéléré'));
+ return EffetsDraconiques.filterItems(actor, Draconique.isTeteDragon, ' déplacement accéléré').length>0;
}
static isDoubleResistanceFleuve(actor) {
- return actor.data.items.find(it => Draconique.isSouffleDragon(it) && it.name.toLowerCase().includes('résistance du fleuve'));
+ return EffetsDraconiques.filterItems(actor, Draconique.isSouffleDragon, 'résistance du fleuve').length>0;
}
static countInertieDraconique(actor) {
- return actor.data.items.filter(it => Draconique.isQueueDragon(it) && it.name.toLowerCase().includes('inertie draconique')).length;
+ return EffetsDraconiques.filterItems(actor, Draconique.isQueueDragon, 'inertie draconique').length;
}
static countMonteeLaborieuse(actor) {
- return actor.data.items.filter(it => Draconique.isQueueSouffle(it) && it.name.toLowerCase().includes('montée laborieuse')).length;
+ return EffetsDraconiques.filterItems(actor, Draconique.isQueueSouffle, 'montée laborieuse').length;
}
static mauvaiseRencontre(actor) {
- return actor.data.items.find(it => Draconique.isQueueSouffle(it) && it.name.toLowerCase().includes('mauvaise rencontre'));
+ const mauvaisesRencontres = EffetsDraconiques.filterItems(actor, Draconique.isQueueSouffle, 'mauvaise rencontre');
+ return mauvaisesRencontres.length>0 ? mauvaisesRencontres[0] : undefined;
}
static isPontImpraticable(actor) {
@@ -152,7 +158,7 @@ export class EffetsDraconiques {
}
static isPeage(actor) {
- return actor.data.items.find(it => Draconique.isSouffleDragon(it) && it.name.toLowerCase().includes('péage'));
+ return EffetsDraconiques.filterItems(actor, Draconique.isSouffleDragon, 'péage').length > 0;
}
diff --git a/module/tmr/pixi-tmr.js b/module/tmr/pixi-tmr.js
index 368e0e00..a5f6cbbe 100644
--- a/module/tmr/pixi-tmr.js
+++ b/module/tmr/pixi-tmr.js
@@ -25,7 +25,7 @@ export class PixiTMR {
for (const [name, img] of Object.entries(PixiTMR.textures)) {
loader = loader.add(name, img);
}
- loader.onLoad.add((error, resaon) => { console.log("ERROR", error, resaon) });
+ loader.onLoad.add((error, reason) => { console.log("ERROR", error, reason) });
loader.load( (loader, resources) => {
onLoad(loader, resources);
for (let onAnimate of this.callbacksOnAnimate) {
diff --git a/templates/actor-creature-sheet.html b/templates/actor-creature-sheet.html
index ae2249fc..1ab46cbb 100644
--- a/templates/actor-creature-sheet.html
+++ b/templates/actor-creature-sheet.html
@@ -55,7 +55,6 @@
{{/each}}
Total Caractéristiques
- {{log 'data-actor-creature' this}}
{{calc.caracTotal}}
@@ -103,11 +102,11 @@
{{comp.name}}
diff --git a/templates/dialog-roll-maitrise-tmr.html b/templates/dialog-roll-maitrise-tmr.html
index 5b0517c9..7408b24d 100644
--- a/templates/dialog-roll-maitrise-tmr.html
+++ b/templates/dialog-roll-maitrise-tmr.html
@@ -5,7 +5,7 @@
Rêve actuel: {{selectedCarac.value}}
- {{competence.name}}: {{numberFormat competence.system.niveau decimals=0 sign=true}}
+ {{competence.name}}: {{numberFormat competence.data.niveau decimals=0 sign=true}}
{{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}}
diff --git a/templates/dialog-roll-recettecuisine.html b/templates/dialog-roll-recettecuisine.html
index 5a03c1ab..394ff935 100644
--- a/templates/dialog-roll-recettecuisine.html
+++ b/templates/dialog-roll-recettecuisine.html
@@ -9,10 +9,10 @@
Caractéristique: {{selectedCarac.label}}
- {{competence.name}}: {{numberFormat competence.system.niveau decimals=0 sign=true}}
+ {{competence.name}}: {{numberFormat competence.data.niveau decimals=0 sign=true}}
- Exotisme: {{oeuvre.system.exotisme}}
+ Exotisme: {{oeuvre.data.exotisme}}
Proportions:
diff --git a/templates/dialog-roll-reve-de-dragon.html b/templates/dialog-roll-reve-de-dragon.html
index 308c6fdf..5e93afda 100644
--- a/templates/dialog-roll-reve-de-dragon.html
+++ b/templates/dialog-roll-reve-de-dragon.html
@@ -5,7 +5,7 @@
Rêve actuel: {{selectedCarac.value}}
- {{competence.name}}: {{numberFormat competence.system.niveau decimals=0 sign=true}}
+ {{competence.name}}: {{numberFormat competence.data.niveau decimals=0 sign=true}}
diff --git a/templates/dialog-roll-signedraconique.html b/templates/dialog-roll-signedraconique.html
index 0bff6729..051341ec 100644
--- a/templates/dialog-roll-signedraconique.html
+++ b/templates/dialog-roll-signedraconique.html
@@ -1,4 +1,3 @@
-{{log 'lecture signe draconique' this}}
{{item.name}}
- {{item.system.quantite}}
- {{numberFormat item.system.encTotal decimals=2}}
+ {{item.data.quantite}}
+ {{numberFormat item.data.encTotal decimals=2}}
diff --git a/templates/chat-resultat-possession.html b/templates/chat-resultat-possession.html
index 9b0c6d7c..025ba08a 100644
--- a/templates/chat-resultat-possession.html
+++ b/templates/chat-resultat-possession.html
@@ -30,4 +30,11 @@
{{/if}}