diff --git a/Knight/knight.html b/Knight/knight.html
index 6ea99b347d..84301428c5 100644
--- a/Knight/knight.html
+++ b/Knight/knight.html
@@ -10175,7 +10175,7 @@ buttonCaracBonus.forEach((button) => {
on(`clicked:${button}`, () => {
getAttrs(['bonusCarac'], (value) => {
const bonusCarac = parseInt(value.bonusCarac, 10) || 0;
- let newValue = button.split('_')[1];
+ let newValue = +button.split('_')[1];
if (bonusCarac === newValue) { newValue = 0; }
@@ -18791,14 +18791,6 @@ monkCeaRoll.forEach((button) => {
modA = attrs[bName];
exec.push(`{{style=${i18n_style} ${i18n_ambidextre}}}`);
-
- if (oTir >= 3) {
- exec.push('{{vMStyleA=-1D}}');
- cRoll.push(-1);
- } else {
- exec.push(`{{vMStyleA=${modA}D}}`);
- cRoll.push(Number(modA));
- }
break;
case 'defensif':
diff --git a/Knight/pug/js/buttons.js b/Knight/pug/js/buttons.js
index 1d33193286..0c38edda20 100644
--- a/Knight/pug/js/buttons.js
+++ b/Knight/pug/js/buttons.js
@@ -91,7 +91,7 @@ buttonCaracBonus.forEach((button) => {
on(`clicked:${button}`, () => {
getAttrs(['bonusCarac'], (value) => {
const bonusCarac = parseInt(value.bonusCarac, 10) || 0;
- let newValue = button.split('_')[1];
+ let newValue = +button.split('_')[1];
if (bonusCarac === newValue) { newValue = 0; }
diff --git a/Knight/pug/js/rolls/pj/combatContact.js b/Knight/pug/js/rolls/pj/combatContact.js
index ab6e5a2d39..eb8616864f 100644
--- a/Knight/pug/js/rolls/pj/combatContact.js
+++ b/Knight/pug/js/rolls/pj/combatContact.js
@@ -223,7 +223,7 @@ rollCombatContact.forEach((button) => {
const armure = attrs.armure;
const armureL = attrs.armureLegende;
- const mod = attrs.jetModifDes;
+ const mod = +attrs.jetModifDes;
const hasBonus = attrs.bonusCarac;
if (button === 'repeating_armeCaC:armecontact') {
@@ -620,7 +620,8 @@ rollCombatContact.forEach((button) => {
const sBonusViolenceD6 = attrs[`${prefix}BVDiversD6`];
const sBonusViolenceFixe = attrs[`${prefix}BVDiversFixe`];
- sEnergie = isApplied(attrs[`${prefix}energie`]);
+ if (button !== 'poingMAContact') { sEnergie = isApplied(attrs[`${prefix}energie`]); }
+
const sEnergieValue = attrs[`${prefix}energieValue`];
if (sBonusDegats) {
diff --git a/Knight/pug/js/rolls/pj/combatDistance.js b/Knight/pug/js/rolls/pj/combatDistance.js
index 4896ebda05..6af6f909bf 100644
--- a/Knight/pug/js/rolls/pj/combatDistance.js
+++ b/Knight/pug/js/rolls/pj/combatDistance.js
@@ -236,7 +236,7 @@ rollCombatDistance.forEach((button) => {
let OD = 0;
- const mod = attrs.jetModifDes;
+ const mod = +attrs.jetModifDes;
const hasBonus = attrs.bonusCarac;
let degats = [];
diff --git a/Knight/pug/js/rolls/pj/combatGrenade.js b/Knight/pug/js/rolls/pj/combatGrenade.js
index 442b3781b5..84918bf1b2 100644
--- a/Knight/pug/js/rolls/pj/combatGrenade.js
+++ b/Knight/pug/js/rolls/pj/combatGrenade.js
@@ -65,7 +65,7 @@ rollCombatGrenade.forEach((button) => {
if (attrs.grenadeAvancee !== '0') { ameliorations = true; }
- const mod = attrs.jetModifDes;
+ const mod = +attrs.jetModifDes;
const hasBonus = attrs.bonusCarac;
const C1 = attrs.caracteristique1Grenade || '0';
diff --git a/Knight/pug/js/rolls/pj/combatImprovise.js b/Knight/pug/js/rolls/pj/combatImprovise.js
index a629aceab5..e52f095bee 100644
--- a/Knight/pug/js/rolls/pj/combatImprovise.js
+++ b/Knight/pug/js/rolls/pj/combatImprovise.js
@@ -143,7 +143,7 @@ for (let i = 0; i < rollCombatImprovise; i += 1) {
if (armure === 'sans' || armure === 'guardian') { hasArmure = false; }
const type = attrs.utilisationArmeAI;
- const mod = attrs.jetModifDes;
+ const mod = +attrs.jetModifDes;
const hasBonus = attrs.bonusCarac;
const C3 = attrs.caracteristique3ArmeImprovisee;
diff --git a/Knight/pug/js/rolls/pj/mechaArmure.js b/Knight/pug/js/rolls/pj/mechaArmure.js
index 7f532a5969..80da9ba3e4 100644
--- a/Knight/pug/js/rolls/pj/mechaArmure.js
+++ b/Knight/pug/js/rolls/pj/mechaArmure.js
@@ -648,7 +648,7 @@ rollCombatArchangel.forEach((button) => {
attrs = await getAttrsAsync(listAttrs);
bCarac = attrs.bonusCarac;
- mod = attrs.jetModifDes;
+ mod = +attrs.jetModifDes;
C1 = attrs.canonMetatronCaracteristique1;
C2 = attrs.canonMetatronCaracteristique2;
@@ -918,7 +918,7 @@ rollCombatNephilim.forEach((button) => {
attrs = await getAttrsAsync(listAttrs);
bCarac = attrs.bonusCarac;
- mod = attrs.jetModifDes;
+ mod = +attrs.jetModifDes;
C1 = attrs.canonMagmaCaracteristique1;
C2 = attrs.canonMagmaCaracteristique2;
@@ -1029,7 +1029,7 @@ rollCombatNephilim.forEach((button) => {
attrs = await getAttrsAsync(listAttrs);
bCarac = attrs.bonusCarac;
- mod = attrs.jetModifDes;
+ mod = +attrs.jetModifDes;
C1 = attrs.MSurturCaracteristique1;
C2 = attrs.MSurturCaracteristique2;
@@ -1268,7 +1268,7 @@ rollCombatDemon.forEach((button) => {
attrs = await getAttrsAsync(listAttrs);
bCarac = attrs.bonusCarac;
- mod = attrs.jetModifDes;
+ mod = +attrs.jetModifDes;
C1 = attrs.DSouffleCaracteristique1;
C2 = attrs.DSouffleCaracteristique2;
@@ -1377,7 +1377,7 @@ rollCombatDemon.forEach((button) => {
active = attrs.MADDjinnWraithActive;
bCarac = attrs.bonusCarac;
- mod = attrs.jetModifDes;
+ mod = +attrs.jetModifDes;
C1 = '@{discretion}';
C2 = attrs.caracteristiqueWraith2;
@@ -1462,7 +1462,7 @@ rollCombatDemon.forEach((button) => {
attrs = await getAttrsAsync(listAttrs);
bCarac = attrs.bonusCarac;
- mod = attrs.jetModifDes;
+ mod = +attrs.jetModifDes;
C1 = attrs.APoingsCaracteristique1;
C2 = attrs.APoingsCaracteristique2;
@@ -1569,7 +1569,7 @@ rollCombatDemon.forEach((button) => {
attrs = await getAttrsAsync(listAttrs);
bCarac = attrs.bonusCarac;
- mod = attrs.jetModifDes;
+ mod = +attrs.jetModifDes;
C1 = attrs.LCGCaracteristique1;
C2 = attrs.LCGCaracteristique2;
diff --git a/Knight/pug/js/rolls/pj/monk.js b/Knight/pug/js/rolls/pj/monk.js
index cfaeac9808..523db72793 100644
--- a/Knight/pug/js/rolls/pj/monk.js
+++ b/Knight/pug/js/rolls/pj/monk.js
@@ -460,14 +460,6 @@ monkCeaRoll.forEach((button) => {
modA = attrs[bName];
exec.push(`{{style=${i18n_style} ${i18n_ambidextre}}}`);
-
- if (oTir >= 3) {
- exec.push('{{vMStyleA=-1D}}');
- cRoll.push(-1);
- } else {
- exec.push(`{{vMStyleA=${modA}D}}`);
- cRoll.push(Number(modA));
- }
break;
case 'defensif':
diff --git a/Knight/pug/js/rolls/pnj/combatDistance.js b/Knight/pug/js/rolls/pnj/combatDistance.js
index 3ad386f70b..b3bd4e3398 100644
--- a/Knight/pug/js/rolls/pnj/combatDistance.js
+++ b/Knight/pug/js/rolls/pnj/combatDistance.js
@@ -202,7 +202,7 @@ rollCombatDistancePNJ.forEach((button) => {
const cRoll = [];
let bonus = [];
- const mod = attrs.jetModifDes;
+ const mod = +attrs.jetModifDes;
let aspectNom = '';
let AEValue = 0;
diff --git a/Knight/pug/js/rolls/pnj/combatImprovise.js b/Knight/pug/js/rolls/pnj/combatImprovise.js
index 3c565086b1..c0e90efbbb 100644
--- a/Knight/pug/js/rolls/pnj/combatImprovise.js
+++ b/Knight/pug/js/rolls/pnj/combatImprovise.js
@@ -111,7 +111,7 @@ for (let i = 0; i < rollCombatImprovise; i += 1) {
let bonus = [];
const type = attrs.utilisationArmeAIPNJ;
- const mod = attrs.jetModifDes;
+ const mod = +attrs.jetModifDes;
let diceDegats = dDgts;
let diceViolence = dViolence;