Big WIP...
This commit is contained in:
@ -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
|
||||
|
||||
Reference in New Issue
Block a user