Various enhancements

This commit is contained in:
2022-11-23 15:27:08 +01:00
parent aa27168c2b
commit 5d8cc300e9
8 changed files with 50 additions and 13 deletions

View File

@ -34,6 +34,7 @@ export class BoLRoll {
description: description,
armorAgiMalus: actor.getArmorAgiMalus(),
armorInitMalus: actor.getArmorInitMalus(),
adv: "0",
mod: 0
}
console.log(">>>>>>>>>>", rollData, actor)
@ -62,6 +63,7 @@ export class BoLRoll {
armorInitMalus: actor.getArmorInitMalus(),
label: label,
careerBonus: 0,
adv: "0",
description: description,
mod: 0
})
@ -142,6 +144,7 @@ export class BoLRoll {
armorInitMalus: actor.getArmorInitMalus(),
mod: 0,
modRanged: 0,
adv: "0",
label: (weapon.name) ? weapon.name : game.i18n.localize('BOL.ui.noWeaponName'),
description: game.i18n.localize('BOL.ui.weaponAttack') + " : " + weapon.name,
}
@ -182,6 +185,7 @@ export class BoLRoll {
attribute: actor.system.attributes.mind,
attrValue: actor.system.attributes.mind.value,
aptValue: 0,
adv: "0",
careerBonus: actor.getAlchemistBonus(),
pcCost: Number(alchemyData.properties.pccost),
pcCostCurrent: Number(alchemyData.properties.pccurrent),
@ -205,6 +209,7 @@ export class BoLRoll {
attribute: actor.system.attributes.mind,
attrValue: actor.system.attributes.mind.value,
aptValue: 0,
adv: "0",
ppCurrent: Number(actor.system.resources.power.value),
careerBonus: actor.getSorcererBonus(),
ppCostArmor: actor.getPPCostArmor(),
@ -380,8 +385,12 @@ export class BoLRoll {
/* -------------------------------------------- */
static preProcessWeapon(rollData, defender) {
if (rollData.mode == "weapon") {
rollData.weaponModifier = rollData.weapon.system.properties.attackModifiers ?? 0;
rollData.weaponModifier = rollData.weapon.system.properties.attackModifiers ?? 0
rollData.attackBonusDice = rollData.weapon.system.properties.attackBonusDice
if ( rollData.attackBonusDice) {
rollData.adv = "1B"
rollData.bDice = 1
}
if (defender) { // If target is selected
rollData.defence = defender.defenseValue
rollData.armorMalus = defender.armorMalusValue
@ -470,7 +479,7 @@ export class BoLRoll {
rollData.registerInit = (rollData.aptitude && rollData.aptitude.key == 'init') ? $('#register-init').is(":checked") : false;
const isMalus = rollData.nbFlaws > rollData.nbBoons
rollData.nbDice += (rollData.attackBonusDice) ? 1 : 0
//rollData.nbDice += (rollData.attackBonusDice) ? 1 : 0
let rollbase = rollData.attrValue + rollData.aptValue
if ( rollData.weapon && rollData.weapon.system.properties.onlymodifier ) {