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

Merge pull request #9773 from Zakarik/Knight

Browse Source 
[Knight] Bugfix Warrior
This commit is contained in:
Nic Bradley
2021-11-18 10:04:41 -08:00
committed by GitHub
parent ba3db1f222 6893351103
commit 9dc3e3cb83
10 changed files with 84 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Knight/knight.html
+42 -50
View File
@@ -5678,8 +5678,6 @@ function getArmorBonus(value, armure, isELumiere, isASLumiere, vDiscretion, oDis
case 'rogue':
ghost = +value.rogueGhost;
log(ghost);
if (ghost !== 0) {
exec.push(`{{special2=${i18n_ghostActive}}}`);
@@ -5753,8 +5751,6 @@ function getArmorBonus(value, armure, isELumiere, isASLumiere, vDiscretion, oDis
typeScholar = +value.warriorScholarA;
typeScout = +value.warriorScoutA;
log(value);
if (typeSoldier !== 0) {
exec.push(`{{special2=${i18n_typeSoldier}}}`);
@@ -5835,8 +5831,6 @@ function getArmorBonus(value, armure, isELumiere, isASLumiere, vDiscretion, oDis
}
}
log(ODWarrior);
if (ODWarrior.length !== 0) { exec.push(`{{vODWarrior=${ODWarrior}}}`); }
break;
}
@@ -6218,8 +6212,6 @@ function getStyleContactMod(value, cPrecis, diceDegats, diceViolence, hasArmure,
case 'precis':
exec.push(`{{style=${i18n_style} ${i18n_precis}}}`);
log(cPrecis);
if (isEDeuxMains && !isAAllegee) {
if (cPrecis.nom !== '0') {
exec.push(`{{cPrecis=${cPrecis.nom}}}`);
@@ -11829,8 +11821,8 @@ rollCombatContact.forEach((button) => {
let ODMALBarbarian = [];
let ODShaman = [];
let ODMALShaman = [];
let ODWarrior = [];
let ODMALWarrior = [];
const ODWarrior = [];
const ODMALWarrior = [];
const vForce = +attrs.force;
const oForce = +attrs[`${ODValue.force}`];
@@ -12240,7 +12232,7 @@ rollCombatContact.forEach((button) => {
ODBarbarian = ODBarbarian.concat(armorBonus.ODBarbarian);
ODShaman = ODShaman.concat(armorBonus.ODShaman);
ODWarrior = ODWarrior.push(armorBonus.ODWarrior);
ODWarrior.push(armorBonus.ODWarrior);
const MALBonus = getMALBonus(attrs, armureL, isELumiere, isASLumiere, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom);
@@ -12261,7 +12253,7 @@ rollCombatContact.forEach((button) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
// FIN GESTION DES BONUS D'ARMURE
OD -= armorBonus.ODWarrior;
@@ -12800,8 +12792,8 @@ rollCombatDistance.forEach((button) => {
let ODMALBarbarian = [];
let ODShaman = [];
let ODMALShaman = [];
let ODWarrior = [];
let ODMALWarrior = [];
const ODWarrior = [];
const ODMALWarrior = [];
const vForce = +attrs.force;
const vDiscretion = +attrs.discretion;
@@ -13115,7 +13107,7 @@ rollCombatDistance.forEach((button) => {
ODBarbarian = ODBarbarian.concat(armorBonus.ODBarbarian);
ODShaman = ODShaman.concat(armorBonus.ODShaman);
ODWarrior = ODWarrior.push(armorBonus.ODWarrior);
ODWarrior.push(armorBonus.ODWarrior);
const MALBonus = getMALBonus(attrs, armureL, isELumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom);
@@ -13136,7 +13128,7 @@ rollCombatDistance.forEach((button) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
// FIN GESTION DES BONUS D'ARMURE
OD -= armorBonus.ODWarrior;
@@ -13476,8 +13468,8 @@ rollCombatGrenade.forEach((button) => {
let ODMALBarbarian = [];
let ODShaman = [];
let ODMALShaman = [];
let ODWarrior = [];
let ODMALWarrior = [];
const ODWarrior = [];
const ODMALWarrior = [];
const vDiscretion = +attrs.discretion;
const oDiscretion = +attrs[`${ODValue.discretion}`];
@@ -13657,7 +13649,7 @@ rollCombatGrenade.forEach((button) => {
ODBarbarian = ODBarbarian.concat(armorBonus.ODBarbarian);
ODShaman = ODShaman.concat(armorBonus.ODShaman);
ODWarrior = ODWarrior.push(armorBonus.ODWarrior);
ODWarrior.push(armorBonus.ODWarrior);
if (armure === 'berserk') {
isTenebricide = true;
@@ -13686,7 +13678,7 @@ rollCombatGrenade.forEach((button) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
// FIN GESTION DES BONUS D'ARMURE
OD -= armorBonus.ODWarrior;
@@ -13991,8 +13983,8 @@ for (let i = 0; i < rollCombatImprovise; i += 1) {
let ODMALBarbarian = [];
let ODShaman = [];
let ODMALShaman = [];
let ODWarrior = [];
let ODMALWarrior = [];
const ODWarrior = [];
const ODMALWarrior = [];
const vForce = +attrs.force;
const oForce = +attrs[ODValue.force];
@@ -14116,7 +14108,7 @@ for (let i = 0; i < rollCombatImprovise; i += 1) {
ODBarbarian = ODBarbarian.concat(armorBonus.ODBarbarian);
ODShaman = ODShaman.concat(armorBonus.ODShaman);
ODWarrior = ODWarrior.push(armorBonus.ODWarrior);
ODWarrior.push(armorBonus.ODWarrior);
const MALBonus = getMALBonus(attrs, armureL, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom);
@@ -14137,7 +14129,7 @@ for (let i = 0; i < rollCombatImprovise; i += 1) {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
// FIN GESTION DES BONUS D'ARMURE
OD -= armorBonus.ODWarrior;
@@ -18582,7 +18574,7 @@ monkCeaRoll.forEach((button) => {
let ODMALBarbarian = [];
let ODMALShaman = [];
let ODMALWarrior = [];
const ODMALWarrior = [];
let attaquesSurprises = [];
let attaquesSurprisesValue = [];
@@ -18677,7 +18669,7 @@ monkCeaRoll.forEach((button) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
// GESTION DES EFFETS DES DIFFERENTES ATTAQUES
@@ -19141,7 +19133,7 @@ on('clicked:distanceRangerLongbow', async (info) => {
let bonus = [];
let OD = 0;
let ODMALWarrior = [];
const ODMALWarrior = [];
let ODMALShaman = [];
let ODMALBarbarian = [];
@@ -19525,7 +19517,7 @@ on('clicked:distanceRangerLongbow', async (info) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
exec.push(`{{cBase=${cBase.join(' - ')}}}`);
@@ -19829,11 +19821,11 @@ on('clicked:simple clicked:simpleRogue', async (info) => {
let OD = 0;
let ODBarbarian = [];
let ODShaman = [];
let ODWarrior = [];
const ODWarrior = [];
let ODMALBarbarian = [];
let ODMALShaman = [];
let ODMALWarrior = [];
const ODMALWarrior = [];
exec.push(roll);
@@ -19896,7 +19888,7 @@ on('clicked:simple clicked:simpleRogue', async (info) => {
ODBarbarian = ODBarbarian.concat(armorBonus.ODBarbarian);
ODShaman = ODShaman.concat(armorBonus.ODShaman);
ODWarrior = ODWarrior.push(armorBonus.ODWarrior);
ODWarrior.push(armorBonus.ODWarrior);
const MALBonus = getMALBonus(attrs, armureL, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom);
@@ -19907,7 +19899,7 @@ on('clicked:simple clicked:simpleRogue', async (info) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
exec.push(`{{cBase=${cBase.join(' - ')}}}`);
@@ -20017,7 +20009,7 @@ on('clicked:simplePriest', async (info) => {
let OD = 0;
let ODMALBarbarian = [];
let ODMALWarrior = [];
const ODMALWarrior = [];
let ODMALShaman = [];
exec.push(roll);
@@ -20082,7 +20074,7 @@ on('clicked:simplePriest', async (info) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
exec.push(`{{cBase=${cBase.join(' - ')}}}`);
@@ -20187,7 +20179,7 @@ on('clicked:simplePsionPuppet clicked:simplePsionDiscord', async (info) => {
let OD = 0;
let ODMALBarbarian = [];
let ODMALWarrior = [];
const ODMALWarrior = [];
let ODMALShaman = [];
exec.push(roll);
@@ -20251,7 +20243,7 @@ on('clicked:simplePsionPuppet clicked:simplePsionDiscord', async (info) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
exec.push(`{{cBase=${cBase.join(' - ')}}}`);
@@ -20358,7 +20350,7 @@ on('clicked:simpleRangerVision', async (info) => {
let OD = 0;
let ODMALBarbarian = [];
let ODMALWarrior = [];
const ODMALWarrior = [];
let ODMALShaman = [];
exec.push(roll);
@@ -20422,7 +20414,7 @@ on('clicked:simpleRangerVision', async (info) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
exec.push(`{{cBase=${cBase.join(' - ')}}}`);
@@ -20526,7 +20518,7 @@ on('clicked:simpleShamanImpregnation', async (info) => {
let OD = 0;
let ODMALBarbarian = [];
let ODMALWarrior = [];
const ODMALWarrior = [];
let ODMALShaman = [];
exec.push(roll);
@@ -20590,7 +20582,7 @@ on('clicked:simpleShamanImpregnation', async (info) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
exec.push(`{{cBase=${cBase.join(' - ')}}}`);
@@ -20689,7 +20681,7 @@ on('clicked:simpleMALShamanImpregnation', async (info) => {
let OD = 0;
let ODMALBarbarian = [];
let ODMALWarrior = [];
const ODMALWarrior = [];
exec.push(roll);
@@ -20751,7 +20743,7 @@ on('clicked:simpleMALShamanImpregnation', async (info) => {
if (isConditionnel === false) { isConditionnel = MALBonus.isConditionnelA; }
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
exec.push(`{{cBase=${cBase.join(' - ')}}}`);
@@ -20850,7 +20842,7 @@ on('clicked:simpleSorcererEtirement', async (info) => {
let OD = 0;
let ODMALBarbarian = [];
let ODMALWarrior = [];
const ODMALWarrior = [];
let ODMALShaman = [];
exec.push(roll);
@@ -20914,7 +20906,7 @@ on('clicked:simpleSorcererEtirement', async (info) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
exec.push(`{{cBase=${cBase.join(' - ')}}}`);
@@ -21025,11 +21017,11 @@ on('clicked:pilotage', async (info) => {
let ODBarbarian = [];
let ODShaman = [];
let ODWarrior = [];
const ODWarrior = [];
let ODMALBarbarian = [];
let ODMALShaman = [];
let ODMALWarrior = [];
const ODMALWarrior = [];
exec.push(roll);
@@ -21092,7 +21084,7 @@ on('clicked:pilotage', async (info) => {
ODBarbarian = ODBarbarian.concat(armorBonus.ODBarbarian);
ODShaman = ODShaman.concat(armorBonus.ODShaman);
ODWarrior = ODWarrior.push(armorBonus.ODWarrior);
ODWarrior.push(armorBonus.ODWarrior);
const MALBonus = getMALBonus(attrs, armureL, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom);
@@ -21103,7 +21095,7 @@ on('clicked:pilotage', async (info) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
exec.push(`{{cBase=${cBase.join(' - ')}}}`);
@@ -22011,7 +22003,7 @@ on('clicked:distanceWizardBorealis', async (info) => {
let OD = 0;
let ODMALBarbarian = [];
let ODMALWarrior = [];
const ODMALWarrior = [];
let ODMALShaman = [];
exec.push(roll);
@@ -22075,7 +22067,7 @@ on('clicked:distanceWizardBorealis', async (info) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
exec.push(`{{cBase=${cBase.join(' - ')}}}`);
Knight/pug/js/_functionsWeapons.js
-8
View File
@@ -2875,8 +2875,6 @@ function getArmorBonus(value, armure, isELumiere, isASLumiere, vDiscretion, oDis
case 'rogue':
ghost = +value.rogueGhost;
log(ghost);
if (ghost !== 0) {
exec.push(`{{special2=${i18n_ghostActive}}}`);
@@ -2950,8 +2948,6 @@ function getArmorBonus(value, armure, isELumiere, isASLumiere, vDiscretion, oDis
typeScholar = +value.warriorScholarA;
typeScout = +value.warriorScoutA;
log(value);
if (typeSoldier !== 0) {
exec.push(`{{special2=${i18n_typeSoldier}}}`);
@@ -3032,8 +3028,6 @@ function getArmorBonus(value, armure, isELumiere, isASLumiere, vDiscretion, oDis
}
}
log(ODWarrior);
if (ODWarrior.length !== 0) { exec.push(`{{vODWarrior=${ODWarrior}}}`); }
break;
}
@@ -3415,8 +3409,6 @@ function getStyleContactMod(value, cPrecis, diceDegats, diceViolence, hasArmure,
case 'precis':
exec.push(`{{style=${i18n_style} ${i18n_precis}}}`);
log(cPrecis);
if (isEDeuxMains && !isAAllegee) {
if (cPrecis.nom !== '0') {
exec.push(`{{cPrecis=${cPrecis.nom}}}`);
Knight/pug/js/rolls/pj/combatContact.js
+4 -4
View File
@@ -281,8 +281,8 @@ rollCombatContact.forEach((button) => {
let ODMALBarbarian = [];
let ODShaman = [];
let ODMALShaman = [];
let ODWarrior = [];
let ODMALWarrior = [];
const ODWarrior = [];
const ODMALWarrior = [];
const vForce = +attrs.force;
const oForce = +attrs[`${ODValue.force}`];
@@ -692,7 +692,7 @@ rollCombatContact.forEach((button) => {
ODBarbarian = ODBarbarian.concat(armorBonus.ODBarbarian);
ODShaman = ODShaman.concat(armorBonus.ODShaman);
ODWarrior = ODWarrior.push(armorBonus.ODWarrior);
ODWarrior.push(armorBonus.ODWarrior);
const MALBonus = getMALBonus(attrs, armureL, isELumiere, isASLumiere, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom);
@@ -713,7 +713,7 @@ rollCombatContact.forEach((button) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
// FIN GESTION DES BONUS D'ARMURE
OD -= armorBonus.ODWarrior;
Knight/pug/js/rolls/pj/combatDistance.js
+4 -4
View File
@@ -248,8 +248,8 @@ rollCombatDistance.forEach((button) => {
let ODMALBarbarian = [];
let ODShaman = [];
let ODMALShaman = [];
let ODWarrior = [];
let ODMALWarrior = [];
const ODWarrior = [];
const ODMALWarrior = [];
const vForce = +attrs.force;
const vDiscretion = +attrs.discretion;
@@ -563,7 +563,7 @@ rollCombatDistance.forEach((button) => {
ODBarbarian = ODBarbarian.concat(armorBonus.ODBarbarian);
ODShaman = ODShaman.concat(armorBonus.ODShaman);
ODWarrior = ODWarrior.push(armorBonus.ODWarrior);
ODWarrior.push(armorBonus.ODWarrior);
const MALBonus = getMALBonus(attrs, armureL, isELumiere, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom);
@@ -584,7 +584,7 @@ rollCombatDistance.forEach((button) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
// FIN GESTION DES BONUS D'ARMURE
OD -= armorBonus.ODWarrior;
Knight/pug/js/rolls/pj/combatGrenade.js
+4 -4
View File
@@ -79,8 +79,8 @@ rollCombatGrenade.forEach((button) => {
let ODMALBarbarian = [];
let ODShaman = [];
let ODMALShaman = [];
let ODWarrior = [];
let ODMALWarrior = [];
const ODWarrior = [];
const ODMALWarrior = [];
const vDiscretion = +attrs.discretion;
const oDiscretion = +attrs[`${ODValue.discretion}`];
@@ -260,7 +260,7 @@ rollCombatGrenade.forEach((button) => {
ODBarbarian = ODBarbarian.concat(armorBonus.ODBarbarian);
ODShaman = ODShaman.concat(armorBonus.ODShaman);
ODWarrior = ODWarrior.push(armorBonus.ODWarrior);
ODWarrior.push(armorBonus.ODWarrior);
if (armure === 'berserk') {
isTenebricide = true;
@@ -289,7 +289,7 @@ rollCombatGrenade.forEach((button) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
// FIN GESTION DES BONUS D'ARMURE
OD -= armorBonus.ODWarrior;
Knight/pug/js/rolls/pj/combatImprovise.js
+4 -4
View File
@@ -164,8 +164,8 @@ for (let i = 0; i < rollCombatImprovise; i += 1) {
let ODMALBarbarian = [];
let ODShaman = [];
let ODMALShaman = [];
let ODWarrior = [];
let ODMALWarrior = [];
const ODWarrior = [];
const ODMALWarrior = [];
const vForce = +attrs.force;
const oForce = +attrs[ODValue.force];
@@ -289,7 +289,7 @@ for (let i = 0; i < rollCombatImprovise; i += 1) {
ODBarbarian = ODBarbarian.concat(armorBonus.ODBarbarian);
ODShaman = ODShaman.concat(armorBonus.ODShaman);
ODWarrior = ODWarrior.push(armorBonus.ODWarrior);
ODWarrior.push(armorBonus.ODWarrior);
const MALBonus = getMALBonus(attrs, armureL, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom);
@@ -310,7 +310,7 @@ for (let i = 0; i < rollCombatImprovise; i += 1) {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
// FIN GESTION DES BONUS D'ARMURE
OD -= armorBonus.ODWarrior;
Knight/pug/js/rolls/pj/monk.js
+2 -2
View File
@@ -223,7 +223,7 @@ monkCeaRoll.forEach((button) => {
let ODMALBarbarian = [];
let ODMALShaman = [];
let ODMALWarrior = [];
const ODMALWarrior = [];
let attaquesSurprises = [];
let attaquesSurprisesValue = [];
@@ -318,7 +318,7 @@ monkCeaRoll.forEach((button) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
// GESTION DES EFFETS DES DIFFERENTES ATTAQUES
Knight/pug/js/rolls/pj/ranger.js
+2 -2
View File
@@ -184,7 +184,7 @@ on('clicked:distanceRangerLongbow', async (info) => {
let bonus = [];
let OD = 0;
let ODMALWarrior = [];
const ODMALWarrior = [];
let ODMALShaman = [];
let ODMALBarbarian = [];
@@ -568,7 +568,7 @@ on('clicked:distanceRangerLongbow', async (info) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
exec.push(`{{cBase=${cBase.join(' - ')}}}`);
Knight/pug/js/rolls/pj/simple.js
+20 -20
View File
@@ -55,11 +55,11 @@ on('clicked:simple clicked:simpleRogue', async (info) => {
let OD = 0;
let ODBarbarian = [];
let ODShaman = [];
let ODWarrior = [];
const ODWarrior = [];
let ODMALBarbarian = [];
let ODMALShaman = [];
let ODMALWarrior = [];
const ODMALWarrior = [];
exec.push(roll);
@@ -122,7 +122,7 @@ on('clicked:simple clicked:simpleRogue', async (info) => {
ODBarbarian = ODBarbarian.concat(armorBonus.ODBarbarian);
ODShaman = ODShaman.concat(armorBonus.ODShaman);
ODWarrior = ODWarrior.push(armorBonus.ODWarrior);
ODWarrior.push(armorBonus.ODWarrior);
const MALBonus = getMALBonus(attrs, armureL, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom);
@@ -133,7 +133,7 @@ on('clicked:simple clicked:simpleRogue', async (info) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
exec.push(`{{cBase=${cBase.join(' - ')}}}`);
@@ -243,7 +243,7 @@ on('clicked:simplePriest', async (info) => {
let OD = 0;
let ODMALBarbarian = [];
let ODMALWarrior = [];
const ODMALWarrior = [];
let ODMALShaman = [];
exec.push(roll);
@@ -308,7 +308,7 @@ on('clicked:simplePriest', async (info) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
exec.push(`{{cBase=${cBase.join(' - ')}}}`);
@@ -413,7 +413,7 @@ on('clicked:simplePsionPuppet clicked:simplePsionDiscord', async (info) => {
let OD = 0;
let ODMALBarbarian = [];
let ODMALWarrior = [];
const ODMALWarrior = [];
let ODMALShaman = [];
exec.push(roll);
@@ -477,7 +477,7 @@ on('clicked:simplePsionPuppet clicked:simplePsionDiscord', async (info) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
exec.push(`{{cBase=${cBase.join(' - ')}}}`);
@@ -584,7 +584,7 @@ on('clicked:simpleRangerVision', async (info) => {
let OD = 0;
let ODMALBarbarian = [];
let ODMALWarrior = [];
const ODMALWarrior = [];
let ODMALShaman = [];
exec.push(roll);
@@ -648,7 +648,7 @@ on('clicked:simpleRangerVision', async (info) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
exec.push(`{{cBase=${cBase.join(' - ')}}}`);
@@ -752,7 +752,7 @@ on('clicked:simpleShamanImpregnation', async (info) => {
let OD = 0;
let ODMALBarbarian = [];
let ODMALWarrior = [];
const ODMALWarrior = [];
let ODMALShaman = [];
exec.push(roll);
@@ -816,7 +816,7 @@ on('clicked:simpleShamanImpregnation', async (info) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
exec.push(`{{cBase=${cBase.join(' - ')}}}`);
@@ -915,7 +915,7 @@ on('clicked:simpleMALShamanImpregnation', async (info) => {
let OD = 0;
let ODMALBarbarian = [];
let ODMALWarrior = [];
const ODMALWarrior = [];
exec.push(roll);
@@ -977,7 +977,7 @@ on('clicked:simpleMALShamanImpregnation', async (info) => {
if (isConditionnel === false) { isConditionnel = MALBonus.isConditionnelA; }
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
exec.push(`{{cBase=${cBase.join(' - ')}}}`);
@@ -1076,7 +1076,7 @@ on('clicked:simpleSorcererEtirement', async (info) => {
let OD = 0;
let ODMALBarbarian = [];
let ODMALWarrior = [];
const ODMALWarrior = [];
let ODMALShaman = [];
exec.push(roll);
@@ -1140,7 +1140,7 @@ on('clicked:simpleSorcererEtirement', async (info) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
exec.push(`{{cBase=${cBase.join(' - ')}}}`);
@@ -1251,11 +1251,11 @@ on('clicked:pilotage', async (info) => {
let ODBarbarian = [];
let ODShaman = [];
let ODWarrior = [];
const ODWarrior = [];
let ODMALBarbarian = [];
let ODMALShaman = [];
let ODMALWarrior = [];
const ODMALWarrior = [];
exec.push(roll);
@@ -1318,7 +1318,7 @@ on('clicked:pilotage', async (info) => {
ODBarbarian = ODBarbarian.concat(armorBonus.ODBarbarian);
ODShaman = ODShaman.concat(armorBonus.ODShaman);
ODWarrior = ODWarrior.push(armorBonus.ODWarrior);
ODWarrior.push(armorBonus.ODWarrior);
const MALBonus = getMALBonus(attrs, armureL, false, false, vDiscretion, oDiscretion, hasBonus, C1Nom, C2Nom, C3Nom, C4Nom);
@@ -1329,7 +1329,7 @@ on('clicked:pilotage', async (info) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
exec.push(`{{cBase=${cBase.join(' - ')}}}`);
Knight/pug/js/rolls/pj/wizard.js
+2 -2
View File
@@ -63,7 +63,7 @@ on('clicked:distanceWizardBorealis', async (info) => {
let OD = 0;
let ODMALBarbarian = [];
let ODMALWarrior = [];
const ODMALWarrior = [];
let ODMALShaman = [];
exec.push(roll);
@@ -127,7 +127,7 @@ on('clicked:distanceWizardBorealis', async (info) => {
ODMALBarbarian = ODMALBarbarian.concat(MALBonus.ODMALBarbarian);
ODMALShaman = ODMALShaman.concat(MALBonus.ODMALShaman);
ODMALWarrior = ODMALWarrior.push(MALBonus.ODMALWarrior);
ODMALWarrior.push(MALBonus.ODMALWarrior);
exec.push(`{{cBase=${cBase.join(' - ')}}}`);