Fix voe 0.8

This commit is contained in:
2021-02-20 09:15:52 +01:00
parent 8b7b474442
commit c594405dcc
35 changed files with 203 additions and 266 deletions

View File

@@ -744,8 +744,8 @@ export class RdDActor extends Actor {
content: message
});
}
const update = { _id: comp._id, 'data.niveau': maxNiveau };
const updated = await this.updateEmbeddedEntity("OwnedItem", update); // Updates one EmbeddedEntity
const update = [ { _id: comp.id, 'data.niveau': maxNiveau } ];
await this.updateEmbeddedDocuments("Item", update); // Updates one EmbeddedEntity
} else {
console.log("Competence not found", compName);
}
@@ -756,8 +756,8 @@ export class RdDActor extends Actor {
let comp = this.getCompetence(compName);
if (comp) {
this.checkCompetenceXP(compName, compValue);
const update = { _id: comp._id, 'data.xp': compValue };
const updated = await this.updateEmbeddedEntity("OwnedItem", update); // Updates one EmbeddedEntity
const update = [ { _id: comp.id, 'data.xp': compValue } ];
await this.updateEmbeddedDocuments("Item", update); // Updates one EmbeddedEntity
} else {
console.log("Competence not found", compName);
}
@@ -768,8 +768,8 @@ export class RdDActor extends Actor {
async updateCompetenceXPSort(compName, compValue) {
let comp = this.getCompetence(compName);
if (comp) {
const update = { _id: comp._id, 'data.xp_sort': compValue };
const updated = await this.updateEmbeddedEntity("OwnedItem", update); // Updates one EmbeddedEntity
const update = [ { _id: comp.id, 'data.xp_sort': compValue } ];
await this.updateEmbeddedDocuments("Item", update); // Updates one EmbeddedEntity
} else {
console.log("Competence not found", compName);
}
@@ -779,8 +779,8 @@ export class RdDActor extends Actor {
async updateCompetenceArchetype(compName, compValue) {
let comp = this.getCompetence(compName);
if (comp) {
const update = { _id: comp._id, 'data.niveau_archetype': compValue };
const updated = await this.updateEmbeddedEntity("OwnedItem", update); // Updates one EmbeddedEntity
const update = [ { _id: comp.id, 'data.niveau_archetype': compValue } ];
await this.updateEmbeddedDocuments("Item", update); // Updates one EmbeddedEntity
} else {
console.log("Competence not found", compName);
}
@@ -885,7 +885,7 @@ export class RdDActor extends Actor {
this.buildSubConteneurObjetList(itemId, list);
//console.log("List to delete", list);
for (let item of list) {
await this.deleteOwnedItem(item.id);
await this.deleteEmbeddedDocuments("Item", [item.id] );
}
}
@@ -904,7 +904,7 @@ export class RdDActor extends Actor {
contenu.splice(index, 1);
index = contenu.indexOf(itemId);
}
await this.updateEmbeddedEntity("OwnedItem", data2use);
await this.updateEmbeddedDocuments("Item", data2use);
}
}
@@ -917,7 +917,7 @@ export class RdDActor extends Actor {
if (conteneur && conteneur.type == 'conteneur') {
let data2use = duplicate(conteneur.data);
data2use.data.contenu.push(itemId);
await this.updateEmbeddedEntity("OwnedItem", data2use);
await this.updateEmbeddedDocuments("Item", [data2use]);
}
}
@@ -932,7 +932,7 @@ export class RdDActor extends Actor {
}
}
if (conteneurFixedList.length > 0)
await this.updateOwnedItem(conteneurFixedList);
await this.updateEmbeddedDocuments('Item', conteneurFixedList);
}
/* -------------------------------------------- */
@@ -945,7 +945,7 @@ export class RdDActor extends Actor {
let itemMap = {};
for (let item of itemsList) {
let srcItem = sourceActor.data.items.find(subItem => subItem._id == item.id);
let newItem = await this.createOwnedItem(duplicate(srcItem));
let newItem = await this.createEmbeddedDocuments("Item", [ duplicate(srcItem) ] );
console.log('New object', newItem, srcItem);
itemMap[srcItem._id] = newItem._id; // Pour garder le lien ancien / nouveau
}
@@ -960,11 +960,11 @@ export class RdDActor extends Actor {
console.log('New conteneur filling!', newConteneur, newItemId, item);
let contenu = duplicate(newConteneur.data.contenu);
contenu.push(newItemId);
await this.updateOwnedItem({ _id: newConteneurId, 'data.contenu': contenu });
await this.updateEmbeddedDocuments( "Item", [{ _id: newConteneurId, 'data.contenu': contenu } ]);
}
}
for (let item of itemsList) {
await sourceActor.deleteOwnedItem(item.id);
await sourceActor.deleteEmbeddedDocuments("Item", [ item.id] );
}
}
@@ -3139,7 +3139,7 @@ export class RdDActor extends Actor {
/* -------------------------------------------- */
_deleteStatusEffectsByIds(effectIds, options) {
this.deleteEmbeddedEntity('ActiveEffect', effectIds, options);
this.deleteEmbeddedDocuments('ActiveEffect', effectIds, options);
this.applyActiveEffects();
}
@@ -3154,7 +3154,7 @@ export class RdDActor extends Actor {
this.deleteStatusEffectById(statusEffect.id, options);
const effet = duplicate(statusEffect);
effet["flags.core.statusId"] = effet.id;
await this.createEmbeddedEntity('ActiveEffect', effet, options);
await this.createEmbeddedDocuments('ActiveEffect', effet, options);
this.applyActiveEffects();
}

View File

@@ -48,6 +48,7 @@ export class RdDItemSheet extends ItemSheet {
/* -------------------------------------------- */
async getData() {
let data = super.getData();
data.categorieCompetences = RdDUtility.getCategorieCompetences();
if ( data.item.type == 'tache' || data.item.type == 'livre' || data.item.type == 'meditation' || data.item.type == 'oeuvre') {
data.caracList = duplicate(game.system.model.Actor.personnage.carac);
@@ -129,7 +130,7 @@ export class RdDItemSheet extends ItemSheet {
_updateObject(event, formData) {
// Données de bonus de cases ?
formData = RdDItemSort.buildBonusCaseStringFromFormData( formData );
//console.log("HERE", this, formData, this.object.data );
return this.object.update(formData);
}
}

View File

@@ -176,7 +176,7 @@ export class RdDTMRDialog extends Dialog {
updateValuesDisplay() {
let ptsreve = document.getElementById("tmr-pointsreve-value");
ptsreve.innerHTML = this.actor.data.data.reve.reve.value;
console.log( this.actor.data.data );
let tmrpos = document.getElementById("tmr-pos");
let tmr = TMRUtility.getTMR(this.actor.data.data.reve.tmrpos.coord);
tmrpos.innerHTML = this.actor.data.data.reve.tmrpos.coord + " (" + tmr.label + ")";