Rework combat

This commit is contained in:
2023-04-08 18:49:54 +02:00
parent e95f7de0c5
commit 6a46faadc2
9 changed files with 178 additions and 104 deletions

View File

@@ -160,7 +160,7 @@ export class HeritiersActor extends Actor {
/* -------------------------------------------- */
prepareUtileSkill(item) {
let specList = []
if (item.system.categorie == "utile") {
if (item && item.system.categorie && item.system.categorie == "utile") {
for (let spec of item.system.specialites) {
specList.push(spec.name)
}
@@ -480,6 +480,20 @@ export class HeritiersActor extends Actor {
}
return talents
}
/* -------------------------------------------- */
getCurrentParade() {
if ( this.system.statutmasque == "masque") {
return this.system.combat.parade.masquee
}
return this.system.combat.parade.demasquee
}
/* -------------------------------------------- */
getCurrentEsquive() {
if ( this.system.statutmasque == "masque") {
return this.system.combat.esquive.masquee
}
return this.system.combat.esquive.demasquee
}
/* -------------------------------------------- */
getTricherie() {
@@ -522,9 +536,15 @@ export class HeritiersActor extends Actor {
}
if (compName) {
rollData.competence = duplicate(this.items.find(item => item.name.toLowerCase() == compName.toLowerCase()) || {})
this.prepareUtileSkill(rollData.competence)
rollData.actionImg = rollData.competence?.img
if (rollData.competence && rollData.competence.name) {
this.prepareUtileSkill(rollData.competence)
rollData.actionImg = rollData.competence?.img
} else {
rollData.competence = undefined
}
}
HeritiersUtility.updateWithTarget(rollData)
return rollData
}
/* -------------------------------------------- */