Various fixes

This commit is contained in:
2022-05-14 17:28:27 +02:00
parent 0a65f767dd
commit fd32c21297
16 changed files with 164 additions and 82 deletions

View File

@ -2537,18 +2537,19 @@ export class RdDActor extends Actor {
async rollCompetence(idOrName) {
let rollData = { competence: Misc.data(this.getCompetence(idOrName)) }
//console.log("COMP CREATURE", name, rollData, name);
if (rollData.competence.type == 'competencecreature') {
if (rollData.competence.data.iscombat) {
const arme = RdDItemCompetenceCreature.toArme(rollData.competence);
RdDCombat.createUsingTarget(this).attaque(rollData.competence, arme);
return;
if (rollData.competence.data.ispossession) {
RdDPossession.managePossession(this, rollData.competence)
} else {
const arme = RdDItemCompetenceCreature.toArme(rollData.competence)
RdDCombat.createUsingTarget(this)?.attaque(competence, arme)
}
return
}
//console.log("COMP CREATURE2");
// Fake competence pour créature
RdDItemCompetenceCreature.setRollDataCreature(rollData);
}
else {
RdDItemCompetenceCreature.setRollDataCreature(rollData)
} else {
rollData.carac = Misc.templateData(this).carac;
}
console.log("rollCompetence !!!", rollData);
@ -2565,6 +2566,12 @@ export class RdDActor extends Actor {
dialog.render(true);
}
/* -------------------------------------------- */
conjurerPossession(possession) {
let draconic = this.getBestDraconic()
RdDPossession.managePossession(this, draconic, possession)
}
/* -------------------------------------------- */
async _competenceResult(rollData) {
await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-competence.html')
@ -2599,8 +2606,8 @@ export class RdDActor extends Actor {
/* -------------------------------------------- */
async rollTache(id) {
const actorData = Misc.data(this);
const tacheData = Misc.data(this.getTache(id));
const compData = Misc.data(this.getCompetence(tacheData.data.competence));
const tacheData = Misc.data(this.getTache(id))
const compData = Misc.data(this.getCompetence(tacheData.data.competence))
compData.data.defaut_carac = tacheData.data.carac; // Patch !
let rollData = {
@ -3202,7 +3209,7 @@ export class RdDActor extends Actor {
let competence = Misc.data(this.getCompetence(arme.data.competence));
if (arme || (competence.type == 'competencecreature' && competence.data.iscombat)) {
if (competence.data.ispossession) {
RdDPossession.managePosession(this, competence);
RdDPossession.managePossession(this, competence);
} else {
RdDCombat.createUsingTarget(this)?.attaque(competence, arme);
}