public/foundryvtt-reve-de-dragon
1
1
Fork 1
Code Issues 4 Pull Requests Actions Projects Releases 186 Wiki Activity

#44 - Gestion sur encombrement corrigée

Browse Source
This commit is contained in:
sladecraven
2020-11-27 15:47:18 +01:00
parent a13d2c7ea9
commit 11e8a64824
6 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
module/actor.js
View File

@ -1086,7 +1086,9 @@ export class RdDActor extends Actor {
difficultesLibres: CONFIG.RDD.difficultesLibres,
surencMalusFlag: false, // A ne pas utiliser pour les sorts
surencMalusValue: 0,
surencMalusApply: false
surencMalusApply: false,
isNatation: false,
useEncForNatation: false
}
let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-roll-sort.html', rollData);
new RdDRollDialog("sort", html, rollData, this ).render(true);
@ -1114,7 +1116,9 @@ export class RdDActor extends Actor {
diffLibre: 0,
surencMalusFlag: (this.data.data.compteurs.surenc.value < 0),
surencMalusValue: this.data.data.compteurs.surenc.value,
surencMalusApply: false
surencMalusApply: false,
isNatation: false,
useEncForNatation: false
}
console.log(caracName, rollData);
let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-roll-carac.html', rollData);
@ -1190,7 +1194,10 @@ export class RdDActor extends Actor {
coupsNonMortels: false,
surencMalusFlag: (this.data.data.compteurs.surenc.value < 0),
surencMalusValue: this.data.data.compteurs.surenc.value,
surencMalusApply: false
surencMalusApply: false,
isNatation: name.toLowerCase().includes("natation"),
useEncForNatation: false,
encValueForNatation: (this.encombrementTotal) ? Math.round(this.encombrementTotal) : 0
}
if ( competence.type == 'competencecreature') { // Specific case for Creatures

7
module/rdd-roll-dialog.js
View File

@ -156,6 +156,10 @@ export class RdDRollDialog extends Dialog {
this.rollData.surencMalusApply = event.currentTarget.checked;
updateRollResult(rollData);
});
html.find('#useEncForNatation').change((event) => {
this.rollData.useEncForNatation = event.currentTarget.checked;
updateRollResult(rollData);
});
}
/* -------------------------------------------- */
@ -164,6 +168,7 @@ export class RdDRollDialog extends Dialog {
const diffConditions = Misc.toInt(rollData.diffConditions);
let malusEnc = (rollData.surencMalusApply ) ? rollData.surencMalusValue : 0;
let diffLibre = Misc.toInt(rollData.diffLibre);
let malusEncNatation = (rollData.useEncForNatation) ? -rollData.encValueForNatation : 0;
let diffCompetence = 0;
if (rollData.competence) {
diffCompetence = Misc.toInt(rollData.competence.data.niveau);
@ -172,7 +177,7 @@ export class RdDRollDialog extends Dialog {
diffCompetence = Misc.toInt(rollData.selectedDraconic.data.niveau);
diffLibre = RdDItemSort.getDifficulte(rollData.selectedSort, diffLibre);
}
return etat + diffCompetence + diffLibre + diffConditions + malusEnc;
return etat + diffCompetence + diffLibre + diffConditions + malusEnc + malusEncNatation;
}
/* -------------------------------------------- */

2
module/rdd-utility.js
View File

@ -150,7 +150,7 @@ export class RdDUtility {
'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-encaisser.html',
'systems/foundryvtt-reve-de-dragon/templates/dialog-tmr.html',
'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-surenc.html',
'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-natation.html',
// Calendrier
'systems/foundryvtt-reve-de-dragon/templates/calendar-template.html',
// Conteneur/item in Actor sheet