diff --git a/Knight/knight.html b/Knight/knight.html index 5232038544..d9dfced57b 100644 --- a/Knight/knight.html +++ b/Knight/knight.html @@ -5956,7 +5956,7 @@ function getWeaponsAutreAA(prefix, AA, eAssistanceAttaque, eASAssassinValue, isC return result; } -function getArmorBonus(value, armure, isELumiere, isASLumiere, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, aEffets = [], simpleRoll = false, distance = false) { +async function getArmorBonus(value, armure, isELumiere, isASLumiere, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, aEffets = [], simpleRoll = false, distance = false) { const result = {}; const exec = []; const cRoll = []; @@ -5978,9 +5978,6 @@ function getArmorBonus(value, armure, isELumiere, isASLumiere, vDiscretion, oDis let C5 = ''; let C6 = ''; let C7 = ''; - let C5Nom = ''; - let C6Nom = ''; - let C7Nom = ''; let ODWarrior = 0; let warrior250PG = 0; @@ -5994,6 +5991,8 @@ function getArmorBonus(value, armure, isELumiere, isASLumiere, vDiscretion, oDis let bonusWarrior = 0; let isConditionnelA = false; + let attrsCarac; + switch (armure) { case 'barbarian': goliath = Number(value.barbarianGoliath); @@ -6066,31 +6065,29 @@ function getArmorBonus(value, armure, isELumiere, isASLumiere, vDiscretion, oDis C6 = value.caracteristiqueTotem2; C7 = value.caracteristiqueTotem3; - C5Nom = C5.slice(2, -1); - C6Nom = C6.slice(2, -1); - C7Nom = C7.slice(2, -1); + attrsCarac = await getCarac(1, C5, C6, C7, '0'); if (shaman === 1 || shaman === 2 || shaman === 3) { - if (C5 !== '0') { - exec.push(`{{totem1=${CaracNom[C5Nom]}}}`); - cRoll.push(C5); - ODShaman.push(`@{${ODValue[C5Nom]}}`); + if (attrsCarac.C1) { + exec.push(`{{totem1=${attrsCarac.C1Nom}}}`); + cRoll.push(attrsCarac.C1Base); + ODShaman.push(`${attrsCarac.C1OD}`); } } if (shaman === 2 || shaman === 3) { - if (C6 !== '0') { - exec.push(`{{totem2=${CaracNom[C6Nom]}}}`); - cRoll.push(C6); - ODShaman.push(`@{${ODValue[C6Nom]}}`); + if (attrsCarac.C2) { + exec.push(`{{totem2=${attrsCarac.C2Nom}}}`); + cRoll.push(attrsCarac.C2Base); + ODShaman.push(`${attrsCarac.C2OD}`); } } if (shaman === 3) { - if (C7 !== '0') { - exec.push(`{{totem3=${CaracNom[C7Nom]}}}`); - cRoll.push(C7); - ODShaman.push(`@{${ODValue[C7Nom]}}`); + if (attrsCarac.C3) { + exec.push(`{{totem3=${attrsCarac.C3Nom}}}`); + cRoll.push(attrsCarac.C3Base); + ODShaman.push(`${attrsCarac.C3OD}`); } } @@ -6210,7 +6207,7 @@ function getArmorBonus(value, armure, isELumiere, isASLumiere, vDiscretion, oDis return result; } -function getMALBonus(value, armureL, isELumiere, isASLumiere, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, aEffets = [], simpleRoll = false, distance = false) { +async function getMALBonus(value, armureL, isELumiere, isASLumiere, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, aEffets = [], simpleRoll = false, distance = false) { const result = {}; const exec = []; const cRoll = []; @@ -6231,8 +6228,8 @@ function getMALBonus(value, armureL, isELumiere, isASLumiere, vDiscretion, oDisc let MALShaman = 0; let C5 = ''; let C6 = ''; - let C5Nom = ''; - let C6Nom = ''; + + let attrsCarac; let ODMALWarrior = 0; @@ -6308,22 +6305,21 @@ function getMALBonus(value, armureL, isELumiere, isASLumiere, vDiscretion, oDisc C5 = value.MALCaracteristiqueTotem1; C6 = value.MALCaracteristiqueTotem2; - C5Nom = C5.slice(2, -1); - C6Nom = C6.slice(2, -1); + attrsCarac = await getCarac(0, C5, C6, '0', '0'); if (MALShaman === 1 || MALShaman === 2) { - if (C5 !== '0') { - exec.push(`{{MALTotem1=${CaracNom[C5Nom]}}}`); - cRoll.push(C5); - ODMALShaman.push(`@{${ODNom[C5Nom]}}`); + if (attrsCarac.C1) { + exec.push(`{{MALTotem1=${attrsCarac.C1Nom}}}`); + cRoll.push(attrsCarac.C1Base); + ODMALShaman.push(`${attrsCarac.C1OD}`); } } if (MALShaman === 2) { - if (C6 !== '0') { - exec.push(`{{MALTotem2=${CaracNom[C6Nom]}}}`); - cRoll.push(C6); - ODMALShaman.push(`@{${ODNom[C6Nom]}}`); + if (attrsCarac.C2) { + exec.push(`{{MALTotem2=${attrsCarac.C2Nom}}}`); + cRoll.push(attrsCarac.C2Base); + ODMALShaman.push(`${attrsCarac.C2OD}`); } } @@ -13516,7 +13512,7 @@ rollCombatContact.forEach((button) => { // GESTION DES BONUS D'ARMURE - const armorBonus = getArmorBonus(attrs, armure, isELumiere, isASLumiere, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); + const armorBonus = await getArmorBonus(attrs, armure, isELumiere, isASLumiere, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); exec = exec.concat(armorBonus.exec); cRoll = cRoll.concat(armorBonus.cRoll); @@ -13532,7 +13528,7 @@ rollCombatContact.forEach((button) => { autresEffets = autresEffets.concat(armorBonus.autresEffets); - const MALBonus = getMALBonus(attrs, armureL, isELumiere, isASLumiere, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); + const MALBonus = await getMALBonus(attrs, armureL, isELumiere, isASLumiere, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); exec = exec.concat(MALBonus.exec); cRoll = cRoll.concat(MALBonus.cRoll); @@ -14434,7 +14430,7 @@ rollCombatDistance.forEach((button) => { // GESTION DES BONUS D'ARMURE - const armorBonus = getArmorBonus(attrs, armure, isELumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets, false, true); + const armorBonus = await getArmorBonus(attrs, armure, isELumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets, false, true); exec = exec.concat(armorBonus.exec); cRoll = cRoll.concat(armorBonus.cRoll); @@ -14450,7 +14446,7 @@ rollCombatDistance.forEach((button) => { autresEffets = autresEffets.concat(armorBonus.autresEffets); - const MALBonus = getMALBonus(attrs, armureL, isELumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets, false, true); + const MALBonus = await getMALBonus(attrs, armureL, isELumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets, false, true); exec = exec.concat(MALBonus.exec); cRoll = cRoll.concat(MALBonus.cRoll); @@ -14971,7 +14967,7 @@ rollCombatGrenade.forEach((button) => { // GESTION DES BONUS D'ARMURE - const armorBonus = getArmorBonus(attrs, armure, hasLumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); + const armorBonus = await getArmorBonus(attrs, armure, hasLumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); exec = exec.concat(armorBonus.exec); cRoll = cRoll.concat(armorBonus.cRoll); @@ -14995,7 +14991,7 @@ rollCombatGrenade.forEach((button) => { exec.push(`{{antiAnatheme=${i18n_antiAnatheme}}} {{antiAnathemeCondition=${i18n_antiAnathemeCondition}}}`); } - const MALBonus = getMALBonus(attrs, armureL, hasLumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); + const MALBonus = await getMALBonus(attrs, armureL, hasLumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); exec = exec.concat(MALBonus.exec); cRoll = cRoll.concat(MALBonus.cRoll); @@ -15450,7 +15446,7 @@ for (let i = 0; i < rollCombatImprovise; i += 1) { // GESTION DES BONUS D'ARMURE - const armorBonus = getArmorBonus(attrs, armure, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); + const armorBonus = await getArmorBonus(attrs, armure, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); exec = exec.concat(armorBonus.exec); cRoll = cRoll.concat(armorBonus.cRoll); @@ -15466,7 +15462,7 @@ for (let i = 0; i < rollCombatImprovise; i += 1) { autresEffets = autresEffets.concat(armorBonus.autresEffets); - const MALBonus = getMALBonus(attrs, armureL, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); + const MALBonus = await getMALBonus(attrs, armureL, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); exec = exec.concat(MALBonus.exec); cRoll = cRoll.concat(MALBonus.cRoll); @@ -20761,7 +20757,7 @@ monkCeaRoll.forEach((button) => { if (hasArmure) { OD += C4OD; } } - const MALBonus = getMALBonus(attrs, armureL, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); + const MALBonus = await getMALBonus(attrs, armureL, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); exec = exec.concat(MALBonus.exec); cRoll = cRoll.concat(MALBonus.cRoll); @@ -21688,7 +21684,7 @@ on('clicked:distanceRangerLongbow', async (info) => { } // FIN DE GESTION DES BONUS SPECIAUX - const MALBonus = getMALBonus(attrs, armureL, isELumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); + const MALBonus = await getMALBonus(attrs, armureL, isELumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); exec = exec.concat(MALBonus.exec); cRoll = cRoll.concat(MALBonus.cRoll); @@ -22097,7 +22093,7 @@ on('clicked:simple clicked:simpleRogue', async (info) => { if (hasArmure) { OD += C4OD; } } - const armorBonus = getArmorBonus(attrs, armure, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, [], true); + const armorBonus = await getArmorBonus(attrs, armure, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, [], true); exec = exec.concat(armorBonus.exec); cRoll = cRoll.concat(armorBonus.cRoll); @@ -22108,7 +22104,7 @@ on('clicked:simple clicked:simpleRogue', async (info) => { ODShaman = ODShaman.concat(armorBonus.ODShaman); ODWarrior.push(armorBonus.ODWarrior); - const MALBonus = getMALBonus(attrs, armureL, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, [], true); + const MALBonus = await getMALBonus(attrs, armureL, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, [], true); exec = exec.concat(MALBonus.exec); cRoll = cRoll.concat(MALBonus.cRoll); @@ -24284,7 +24280,7 @@ on('clicked:distanceWizardBorealis', async (info) => { if (hasArmure) { OD += C4OD; } } - const MALBonus = getMALBonus(attrs, armureL, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); + const MALBonus = await getMALBonus(attrs, armureL, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); exec = exec.concat(MALBonus.exec); cRoll = cRoll.concat(MALBonus.cRoll); diff --git a/Knight/pug/js/_functionsWeapons.js b/Knight/pug/js/_functionsWeapons.js index c7b7d09e6d..03c1118f34 100644 --- a/Knight/pug/js/_functionsWeapons.js +++ b/Knight/pug/js/_functionsWeapons.js @@ -3136,7 +3136,7 @@ function getWeaponsAutreAA(prefix, AA, eAssistanceAttaque, eASAssassinValue, isC return result; } -function getArmorBonus(value, armure, isELumiere, isASLumiere, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, aEffets = [], simpleRoll = false, distance = false) { +async function getArmorBonus(value, armure, isELumiere, isASLumiere, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, aEffets = [], simpleRoll = false, distance = false) { const result = {}; const exec = []; const cRoll = []; @@ -3158,9 +3158,6 @@ function getArmorBonus(value, armure, isELumiere, isASLumiere, vDiscretion, oDis let C5 = ''; let C6 = ''; let C7 = ''; - let C5Nom = ''; - let C6Nom = ''; - let C7Nom = ''; let ODWarrior = 0; let warrior250PG = 0; @@ -3174,6 +3171,8 @@ function getArmorBonus(value, armure, isELumiere, isASLumiere, vDiscretion, oDis let bonusWarrior = 0; let isConditionnelA = false; + let attrsCarac; + switch (armure) { case 'barbarian': goliath = Number(value.barbarianGoliath); @@ -3246,31 +3245,29 @@ function getArmorBonus(value, armure, isELumiere, isASLumiere, vDiscretion, oDis C6 = value.caracteristiqueTotem2; C7 = value.caracteristiqueTotem3; - C5Nom = C5.slice(2, -1); - C6Nom = C6.slice(2, -1); - C7Nom = C7.slice(2, -1); + attrsCarac = await getCarac(1, C5, C6, C7, '0'); if (shaman === 1 || shaman === 2 || shaman === 3) { - if (C5 !== '0') { - exec.push(`{{totem1=${CaracNom[C5Nom]}}}`); - cRoll.push(C5); - ODShaman.push(`@{${ODValue[C5Nom]}}`); + if (attrsCarac.C1) { + exec.push(`{{totem1=${attrsCarac.C1Nom}}}`); + cRoll.push(attrsCarac.C1Base); + ODShaman.push(`${attrsCarac.C1OD}`); } } if (shaman === 2 || shaman === 3) { - if (C6 !== '0') { - exec.push(`{{totem2=${CaracNom[C6Nom]}}}`); - cRoll.push(C6); - ODShaman.push(`@{${ODValue[C6Nom]}}`); + if (attrsCarac.C2) { + exec.push(`{{totem2=${attrsCarac.C2Nom}}}`); + cRoll.push(attrsCarac.C2Base); + ODShaman.push(`${attrsCarac.C2OD}`); } } if (shaman === 3) { - if (C7 !== '0') { - exec.push(`{{totem3=${CaracNom[C7Nom]}}}`); - cRoll.push(C7); - ODShaman.push(`@{${ODValue[C7Nom]}}`); + if (attrsCarac.C3) { + exec.push(`{{totem3=${attrsCarac.C3Nom}}}`); + cRoll.push(attrsCarac.C3Base); + ODShaman.push(`${attrsCarac.C3OD}`); } } @@ -3390,7 +3387,7 @@ function getArmorBonus(value, armure, isELumiere, isASLumiere, vDiscretion, oDis return result; } -function getMALBonus(value, armureL, isELumiere, isASLumiere, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, aEffets = [], simpleRoll = false, distance = false) { +async function getMALBonus(value, armureL, isELumiere, isASLumiere, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, aEffets = [], simpleRoll = false, distance = false) { const result = {}; const exec = []; const cRoll = []; @@ -3411,8 +3408,8 @@ function getMALBonus(value, armureL, isELumiere, isASLumiere, vDiscretion, oDisc let MALShaman = 0; let C5 = ''; let C6 = ''; - let C5Nom = ''; - let C6Nom = ''; + + let attrsCarac; let ODMALWarrior = 0; @@ -3488,22 +3485,21 @@ function getMALBonus(value, armureL, isELumiere, isASLumiere, vDiscretion, oDisc C5 = value.MALCaracteristiqueTotem1; C6 = value.MALCaracteristiqueTotem2; - C5Nom = C5.slice(2, -1); - C6Nom = C6.slice(2, -1); + attrsCarac = await getCarac(0, C5, C6, '0', '0'); if (MALShaman === 1 || MALShaman === 2) { - if (C5 !== '0') { - exec.push(`{{MALTotem1=${CaracNom[C5Nom]}}}`); - cRoll.push(C5); - ODMALShaman.push(`@{${ODNom[C5Nom]}}`); + if (attrsCarac.C1) { + exec.push(`{{MALTotem1=${attrsCarac.C1Nom}}}`); + cRoll.push(attrsCarac.C1Base); + ODMALShaman.push(`${attrsCarac.C1OD}`); } } if (MALShaman === 2) { - if (C6 !== '0') { - exec.push(`{{MALTotem2=${CaracNom[C6Nom]}}}`); - cRoll.push(C6); - ODMALShaman.push(`@{${ODNom[C6Nom]}}`); + if (attrsCarac.C2) { + exec.push(`{{MALTotem2=${attrsCarac.C2Nom}}}`); + cRoll.push(attrsCarac.C2Base); + ODMALShaman.push(`${attrsCarac.C2OD}`); } } diff --git a/Knight/pug/js/rolls/pj/combatContact.js b/Knight/pug/js/rolls/pj/combatContact.js index f3319ee18b..21e883148e 100644 --- a/Knight/pug/js/rolls/pj/combatContact.js +++ b/Knight/pug/js/rolls/pj/combatContact.js @@ -740,7 +740,7 @@ rollCombatContact.forEach((button) => { // GESTION DES BONUS D'ARMURE - const armorBonus = getArmorBonus(attrs, armure, isELumiere, isASLumiere, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); + const armorBonus = await getArmorBonus(attrs, armure, isELumiere, isASLumiere, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); exec = exec.concat(armorBonus.exec); cRoll = cRoll.concat(armorBonus.cRoll); @@ -756,7 +756,7 @@ rollCombatContact.forEach((button) => { autresEffets = autresEffets.concat(armorBonus.autresEffets); - const MALBonus = getMALBonus(attrs, armureL, isELumiere, isASLumiere, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); + const MALBonus = await getMALBonus(attrs, armureL, isELumiere, isASLumiere, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); exec = exec.concat(MALBonus.exec); cRoll = cRoll.concat(MALBonus.cRoll); diff --git a/Knight/pug/js/rolls/pj/combatDistance.js b/Knight/pug/js/rolls/pj/combatDistance.js index c9f4280736..4c1736ad10 100644 --- a/Knight/pug/js/rolls/pj/combatDistance.js +++ b/Knight/pug/js/rolls/pj/combatDistance.js @@ -606,7 +606,7 @@ rollCombatDistance.forEach((button) => { // GESTION DES BONUS D'ARMURE - const armorBonus = getArmorBonus(attrs, armure, isELumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets, false, true); + const armorBonus = await getArmorBonus(attrs, armure, isELumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets, false, true); exec = exec.concat(armorBonus.exec); cRoll = cRoll.concat(armorBonus.cRoll); @@ -622,7 +622,7 @@ rollCombatDistance.forEach((button) => { autresEffets = autresEffets.concat(armorBonus.autresEffets); - const MALBonus = getMALBonus(attrs, armureL, isELumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets, false, true); + const MALBonus = await getMALBonus(attrs, armureL, isELumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets, false, true); exec = exec.concat(MALBonus.exec); cRoll = cRoll.concat(MALBonus.cRoll); diff --git a/Knight/pug/js/rolls/pj/combatGrenade.js b/Knight/pug/js/rolls/pj/combatGrenade.js index 9e9cd32cba..030c00bfc9 100644 --- a/Knight/pug/js/rolls/pj/combatGrenade.js +++ b/Knight/pug/js/rolls/pj/combatGrenade.js @@ -259,7 +259,7 @@ rollCombatGrenade.forEach((button) => { // GESTION DES BONUS D'ARMURE - const armorBonus = getArmorBonus(attrs, armure, hasLumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); + const armorBonus = await getArmorBonus(attrs, armure, hasLumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); exec = exec.concat(armorBonus.exec); cRoll = cRoll.concat(armorBonus.cRoll); @@ -283,7 +283,7 @@ rollCombatGrenade.forEach((button) => { exec.push(`{{antiAnatheme=${i18n_antiAnatheme}}} {{antiAnathemeCondition=${i18n_antiAnathemeCondition}}}`); } - const MALBonus = getMALBonus(attrs, armureL, hasLumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); + const MALBonus = await getMALBonus(attrs, armureL, hasLumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); exec = exec.concat(MALBonus.exec); cRoll = cRoll.concat(MALBonus.cRoll); diff --git a/Knight/pug/js/rolls/pj/combatImprovise.js b/Knight/pug/js/rolls/pj/combatImprovise.js index e3e4881694..c69b38285a 100644 --- a/Knight/pug/js/rolls/pj/combatImprovise.js +++ b/Knight/pug/js/rolls/pj/combatImprovise.js @@ -282,7 +282,7 @@ for (let i = 0; i < rollCombatImprovise; i += 1) { // GESTION DES BONUS D'ARMURE - const armorBonus = getArmorBonus(attrs, armure, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); + const armorBonus = await getArmorBonus(attrs, armure, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); exec = exec.concat(armorBonus.exec); cRoll = cRoll.concat(armorBonus.cRoll); @@ -298,7 +298,7 @@ for (let i = 0; i < rollCombatImprovise; i += 1) { autresEffets = autresEffets.concat(armorBonus.autresEffets); - const MALBonus = getMALBonus(attrs, armureL, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); + const MALBonus = await getMALBonus(attrs, armureL, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); exec = exec.concat(MALBonus.exec); cRoll = cRoll.concat(MALBonus.cRoll); diff --git a/Knight/pug/js/rolls/pj/monk.js b/Knight/pug/js/rolls/pj/monk.js index 51438b02be..5e4baf4d9e 100644 --- a/Knight/pug/js/rolls/pj/monk.js +++ b/Knight/pug/js/rolls/pj/monk.js @@ -312,7 +312,7 @@ monkCeaRoll.forEach((button) => { if (hasArmure) { OD += C4OD; } } - const MALBonus = getMALBonus(attrs, armureL, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); + const MALBonus = await getMALBonus(attrs, armureL, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); exec = exec.concat(MALBonus.exec); cRoll = cRoll.concat(MALBonus.cRoll); diff --git a/Knight/pug/js/rolls/pj/ranger.js b/Knight/pug/js/rolls/pj/ranger.js index c4aee1ede8..44f847557b 100644 --- a/Knight/pug/js/rolls/pj/ranger.js +++ b/Knight/pug/js/rolls/pj/ranger.js @@ -590,7 +590,7 @@ on('clicked:distanceRangerLongbow', async (info) => { } // FIN DE GESTION DES BONUS SPECIAUX - const MALBonus = getMALBonus(attrs, armureL, isELumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); + const MALBonus = await getMALBonus(attrs, armureL, isELumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); exec = exec.concat(MALBonus.exec); cRoll = cRoll.concat(MALBonus.cRoll); diff --git a/Knight/pug/js/rolls/pj/simple.js b/Knight/pug/js/rolls/pj/simple.js index e300bb2614..8648aef323 100644 --- a/Knight/pug/js/rolls/pj/simple.js +++ b/Knight/pug/js/rolls/pj/simple.js @@ -113,7 +113,7 @@ on('clicked:simple clicked:simpleRogue', async (info) => { if (hasArmure) { OD += C4OD; } } - const armorBonus = getArmorBonus(attrs, armure, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, [], true); + const armorBonus = await getArmorBonus(attrs, armure, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, [], true); exec = exec.concat(armorBonus.exec); cRoll = cRoll.concat(armorBonus.cRoll); @@ -124,7 +124,7 @@ on('clicked:simple clicked:simpleRogue', async (info) => { ODShaman = ODShaman.concat(armorBonus.ODShaman); ODWarrior.push(armorBonus.ODWarrior); - const MALBonus = getMALBonus(attrs, armureL, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, [], true); + const MALBonus = await getMALBonus(attrs, armureL, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, [], true); exec = exec.concat(MALBonus.exec); cRoll = cRoll.concat(MALBonus.cRoll); diff --git a/Knight/pug/js/rolls/pj/wizard.js b/Knight/pug/js/rolls/pj/wizard.js index 7997403ea8..bc297565a7 100644 --- a/Knight/pug/js/rolls/pj/wizard.js +++ b/Knight/pug/js/rolls/pj/wizard.js @@ -126,7 +126,7 @@ on('clicked:distanceWizardBorealis', async (info) => { if (hasArmure) { OD += C4OD; } } - const MALBonus = getMALBonus(attrs, armureL, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); + const MALBonus = await getMALBonus(attrs, armureL, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets); exec = exec.concat(MALBonus.exec); cRoll = cRoll.concat(MALBonus.cRoll);