slaguru666/roll20-character-sheets-tester
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10861 from Zakarik/Knight

Browse Source 
[Knight]Bugfix Démoralisant & Goliath
This commit is contained in:
David
2022-08-01 12:32:54 -04:00
committed by GitHub
parent b39cb0a351 173128cef0
commit 818d03e5fc
3 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Knight/knight.html
+17 -13
View File
@@ -2962,7 +2962,7 @@ function getWeaponsEffects(prefix, effet, hasArmure, armure, vForce, vDexterite,
const eDegatsContinus = isApplied(effet[`${prefix}degatContinue`]);
const eDegatsContinusV = effet[`${prefix}degatContinueValue`] || 0;
const eDeuxMains = isApplied(effet[`${prefix}deuxMains`]);
const eDemoralisant = isApplied(effet[`${prefix}eDemoralisant`]);
const eDemoralisant = isApplied(effet[`${prefix}demoralisant`]);
const eDesignation = isApplied(effet[`${prefix}designation`]);
const eDestructeur = isApplied(effet[`${prefix}destructeur`]);
const eDestructeurV = 2;
@@ -5702,7 +5702,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) {
function getArmorBonus(value, armure, isELumiere, isASLumiere, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, aEffets = [], simpleRoll = false, distance = false) {
const result = {};
const exec = [];
const cRoll = [];
@@ -5761,11 +5761,13 @@ function getArmorBonus(value, armure, isELumiere, isASLumiere, vDiscretion, oDis
if (ODBarbarian.length === 0) { exec.push('{{vODBarbarian=[[0]]}}'); } else { exec.push(`{{vODBarbarian=[[${ODBarbarian.join('+')}]]}}`); }
diceDegats += goliath;
diceViolence += goliath;
if (!distance) {
diceDegats += goliath;
diceViolence += goliath;
exec.push(`{{vBarbarianD=+${goliath}D6}}`);
exec.push(`{{vBarbarianV=+${goliath}D6}}`);
exec.push(`{{vBarbarianD=+${goliath}D6}}`);
exec.push(`{{vBarbarianV=+${goliath}D6}}`);
}
if (goliath >= 4 && !aEffets.includes(i18n_antiVehicule)) {
autresEffets.push(i18n_antiVehicule);
@@ -5954,7 +5956,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) {
function getMALBonus(value, armureL, isELumiere, isASLumiere, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, aEffets = [], simpleRoll = false, distance = false) {
const result = {};
const exec = [];
const cRoll = [];
@@ -6003,11 +6005,13 @@ function getMALBonus(value, armureL, isELumiere, isASLumiere, vDiscretion, oDisc
if (ODMALBarbarian.length === 0) { exec.push('{{vODMALBarbarian=[[0]]}}'); } else { exec.push(`{{vODMALBarbarian=[[${ODMALBarbarian.join('+')}]]}}`); }
diceDegats += MALGoliath;
diceViolence += MALGoliath;
if (!distance) {
diceDegats += MALGoliath;
diceViolence += MALGoliath;
exec.push(`{{vMALBarbarianD=+${MALGoliath}D6}}`);
exec.push(`{{vMALBarbarianV=+${MALGoliath}D6}}`);
exec.push(`{{vMALBarbarianD=+${MALGoliath}D6}}`);
exec.push(`{{vMALBarbarianV=+${MALGoliath}D6}}`);
}
if (MALGoliath >= 4 && !aEffets.includes(i18n_antiVehicule)) {
autresEffets.push(i18n_antiVehicule);
@@ -13811,7 +13815,7 @@ rollCombatDistance.forEach((button) => {
// GESTION DES BONUS D'ARMURE
const armorBonus = getArmorBonus(attrs, armure, isELumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets);
const armorBonus = 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);
@@ -13827,7 +13831,7 @@ rollCombatDistance.forEach((button) => {
autresEffets = autresEffets.concat(armorBonus.autresEffets);
const MALBonus = getMALBonus(attrs, armureL, isELumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets);
const MALBonus = 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);
Knight/pug/js/_functionsWeapons.js
+15 -11
View File
@@ -150,7 +150,7 @@ function getWeaponsEffects(prefix, effet, hasArmure, armure, vForce, vDexterite,
const eDegatsContinus = isApplied(effet[`${prefix}degatContinue`]);
const eDegatsContinusV = effet[`${prefix}degatContinueValue`] || 0;
const eDeuxMains = isApplied(effet[`${prefix}deuxMains`]);
const eDemoralisant = isApplied(effet[`${prefix}eDemoralisant`]);
const eDemoralisant = isApplied(effet[`${prefix}demoralisant`]);
const eDesignation = isApplied(effet[`${prefix}designation`]);
const eDestructeur = isApplied(effet[`${prefix}destructeur`]);
const eDestructeurV = 2;
@@ -2890,7 +2890,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) {
function getArmorBonus(value, armure, isELumiere, isASLumiere, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, aEffets = [], simpleRoll = false, distance = false) {
const result = {};
const exec = [];
const cRoll = [];
@@ -2949,11 +2949,13 @@ function getArmorBonus(value, armure, isELumiere, isASLumiere, vDiscretion, oDis
if (ODBarbarian.length === 0) { exec.push('{{vODBarbarian=[[0]]}}'); } else { exec.push(`{{vODBarbarian=[[${ODBarbarian.join('+')}]]}}`); }
diceDegats += goliath;
diceViolence += goliath;
if (!distance) {
diceDegats += goliath;
diceViolence += goliath;
exec.push(`{{vBarbarianD=+${goliath}D6}}`);
exec.push(`{{vBarbarianV=+${goliath}D6}}`);
exec.push(`{{vBarbarianD=+${goliath}D6}}`);
exec.push(`{{vBarbarianV=+${goliath}D6}}`);
}
if (goliath >= 4 && !aEffets.includes(i18n_antiVehicule)) {
autresEffets.push(i18n_antiVehicule);
@@ -3142,7 +3144,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) {
function getMALBonus(value, armureL, isELumiere, isASLumiere, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, aEffets = [], simpleRoll = false, distance = false) {
const result = {};
const exec = [];
const cRoll = [];
@@ -3191,11 +3193,13 @@ function getMALBonus(value, armureL, isELumiere, isASLumiere, vDiscretion, oDisc
if (ODMALBarbarian.length === 0) { exec.push('{{vODMALBarbarian=[[0]]}}'); } else { exec.push(`{{vODMALBarbarian=[[${ODMALBarbarian.join('+')}]]}}`); }
diceDegats += MALGoliath;
diceViolence += MALGoliath;
if (!distance) {
diceDegats += MALGoliath;
diceViolence += MALGoliath;
exec.push(`{{vMALBarbarianD=+${MALGoliath}D6}}`);
exec.push(`{{vMALBarbarianV=+${MALGoliath}D6}}`);
exec.push(`{{vMALBarbarianD=+${MALGoliath}D6}}`);
exec.push(`{{vMALBarbarianV=+${MALGoliath}D6}}`);
}
if (MALGoliath >= 4 && !aEffets.includes(i18n_antiVehicule)) {
autresEffets.push(i18n_antiVehicule);
Knight/pug/js/rolls/pj/combatDistance.js
+2 -2
View File
@@ -565,7 +565,7 @@ rollCombatDistance.forEach((button) => {
// GESTION DES BONUS D'ARMURE
const armorBonus = getArmorBonus(attrs, armure, isELumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets);
const armorBonus = 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);
@@ -581,7 +581,7 @@ rollCombatDistance.forEach((button) => {
autresEffets = autresEffets.concat(armorBonus.autresEffets);
const MALBonus = getMALBonus(attrs, armureL, isELumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom, autresEffets);
const MALBonus = 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);