Merge branch 'master' of gitlab.com:LeRatierBretonnien/foundryvtt-reve-de-dragon
This commit is contained in:
202
module/actor.js
202
module/actor.js
@ -7,6 +7,8 @@ import { RdDUtility } from "./rdd-utility.js";
|
||||
import { TMRUtility } from "./tmr-utility.js";
|
||||
import { RdDRollDialog } from "./rdd-roll-dialog.js";
|
||||
import { RdDTMRDialog } from "./rdd-tmr-dialog.js";
|
||||
import { Misc } from "./misc.js";
|
||||
|
||||
import { RdDResolutionTable } from "./rdd-resolution-table.js";
|
||||
|
||||
export class RdDActor extends Actor {
|
||||
@ -146,91 +148,45 @@ export class RdDActor extends Actor {
|
||||
console.log(">>> ROLL", rollData, rolled);
|
||||
let xpmsg = RdDResolutionTable.buildXpMessage(rolled, rollData.finalLevel);
|
||||
|
||||
let specialStr = "<br>Points de taches : " + rolled.tache + ", Points de qualité: " + rolled.qualite;
|
||||
let resumeCompetence = (rollData.competence) ? rollData.competence.name : rollData.bmValue;
|
||||
let explications = "<br>Points de taches : " + rolled.tache + ", Points de qualité: " + rolled.qualite;
|
||||
|
||||
// Fight management !
|
||||
let defenseMsg;
|
||||
let encaisser = false;
|
||||
if (rollData.arme || (rollData.competence && rollData.competence.name.toLowerCase() == 'esquive') ) {
|
||||
explications = ""
|
||||
// In case of fight, replace the message per dommages + localization. it indicates if result is OK or not
|
||||
if (rollData.attackerRoll) { // Defense case !
|
||||
if (rolled.isSuccess) {
|
||||
specialStr = "<br><strong>Attaque parée/esquivée !</strong>";
|
||||
explications += "<br><strong>Attaque parée/esquivée !</strong>";
|
||||
} else {
|
||||
specialStr = "<br><strong>Esquive/Parade échouée, encaissement !</strong>";
|
||||
explications += "<br><strong>Esquive/Parade échouée, encaissement !</strong>";
|
||||
encaisser = true;
|
||||
}
|
||||
} else { // This is the attack roll!
|
||||
if (rolled.isSuccess) {
|
||||
if (rolled.tache >= 3) { // Critique !
|
||||
if (rolled.isPart) { // Particulière !
|
||||
console.log("TODO Gérer critique!");
|
||||
}
|
||||
rollData.domArmePlusDom = parseInt(rollData.arme.data.dommages);
|
||||
if (rollData.selectedCarac.label == "Mêlée") // +dom only for Melee
|
||||
rollData.domArmePlusDom += parseInt(this.data.data.attributs.plusdom.value);
|
||||
if (rollData.selectedCarac.label == "Lancer") { // +dom only for Melee/Lancer
|
||||
let bdom = parseInt(this.data.data.attributs.plusdom.value);
|
||||
if (bdom > parseInt(rollData.arme.data.dommages))
|
||||
bdom = parseInt(rollData.arme.data.dommages);
|
||||
rollData.domArmePlusDom += bdom
|
||||
}
|
||||
let encaissement = new Roll("2d10 + @domArmePlusDom", {domArmePlusDom : rollData.domArmePlusDom});
|
||||
rollData.degats = parseInt(encaissement.roll().total);
|
||||
rollData.domArmePlusDom = this._calculBonusDommages(rollData.selectedCarac, rollData.arme);
|
||||
rollData.degats = new Roll("2d10").roll().total + rollData.domArmePlusDom;
|
||||
rollData.loc = RdDUtility.getLocalisation();
|
||||
for (let target of game.user.targets) {
|
||||
defenseMsg = RdDUtility.buildDefenseChatCard(this, target, rollData);
|
||||
specialStr = "<br><strong>Cible</strong> : " + target.actor.data.name;
|
||||
explications += "<br><strong>Cible</strong> : " + target.actor.data.name;
|
||||
}
|
||||
specialStr += "<br>Dommages : " + rollData.degats + "<br>Localisation : " + rollData.loc.label;
|
||||
explications += "<br>Dommages : " + rollData.degats + "<br>Localisation : " + rollData.loc.label;
|
||||
} else {
|
||||
specialStr = "<br>Echec ! Pas de dommages";
|
||||
explications = "<br>Echec ! Pas de dommages";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Sort management
|
||||
let lvl = ""
|
||||
if (rollData.selectedSort) { // Lancement de sort !
|
||||
let draconic = rollData.selectedSort.data.draconic;
|
||||
let costReve = rollData.selectedSort.data.ptreve_reel || rollData.selectedSort.data.ptreve; // cas de sort à ptreve variables
|
||||
specialStr = "<br>Lancement du sort <strong>" + rollData.selectedSort.name + "</strong> : " + draconic.charAt(0).toUpperCase() + draconic.slice(1) + "/" + rollData.selectedSort.data.difficulte +
|
||||
"/" + rollData.selectedSort.data.caseTMR + "/R" + costReve;
|
||||
specialStr += "<br>Depuis la case " + rollData.coord + " (" + TMRUtility.getTMRDescription(rollData.coord).label + ")";
|
||||
lvl = rollData.selectedDraconic.name + "/" + rollData.selectedSort.name;
|
||||
let myReve = duplicate(this.data.data.reve.reve);
|
||||
if (rolled.isSuccess) { // Réussite du sort !
|
||||
if (rolled.tache >= 3) costReve = Math.ceil(costReve / 2);
|
||||
if (costReve < 1) costReve = 1;
|
||||
myReve.value = myReve.value - costReve; // Todo 0 pts de reve !!!!
|
||||
if (myReve.value < 0) myReve.value = 0;
|
||||
await this.update({ "data.reve.reve": myReve });
|
||||
specialStr += "<br>Réussite du sort pour " + costReve + " Points de Rêve";
|
||||
if (!rollData.isSortReserve) {
|
||||
this.currentTMR.close(); // Close TMR !
|
||||
} else { // Mise en réserve
|
||||
let reserve = duplicate(this.data.data.reve.reserve);
|
||||
reserve.list.push({ coord: rollData.coord, sort: duplicate(rollData.selectedSort), draconic: duplicate(rollData.selectedDraconic) });
|
||||
await this.update({ "data.reve.reserve": reserve });
|
||||
this.currentTMR.updateSortReserve();
|
||||
}
|
||||
} else {
|
||||
if (rolled.tache == -4) { // Echec total !
|
||||
costReve *= 2;
|
||||
myReve.value = myReve.value - costReve; // Todo 0 pts de reve !!!!
|
||||
if (myReve.value < 0) myReve.value = 0;
|
||||
await this.update({ "data.reve.reve": myReve });
|
||||
specialStr += "<br><strong>Echec TOTAL</strong> du sort : " + costReve + " Points de Rêve";
|
||||
} else {
|
||||
specialStr += "<br>Echec du sort !";
|
||||
}
|
||||
this.currentTMR.close(); // Close TMR !
|
||||
}
|
||||
if (myReve.value == 0) { // 0 points de reve
|
||||
ChatMessage.create({ title: "Zero Points de Reve !", content: this.name + " est réduit à 0 Points de Rêve, et tombe endormi !" });
|
||||
this.currentTMR.close(); // Close TMR !
|
||||
}
|
||||
} else {
|
||||
lvl = (rollData.competence) ? rollData.competence.name : rollData.bmValue;
|
||||
resumeCompetence = rollData.selectedDraconic.name + "/" + sort.name;
|
||||
explications = await this._rollLancementDeSort(rollData, rolled);
|
||||
}
|
||||
|
||||
// Save it for fight in the flags area
|
||||
@ -238,9 +194,10 @@ export class RdDActor extends Actor {
|
||||
|
||||
// Final chat message
|
||||
let chatOptions = {
|
||||
content: "<strong>Test : " + rollData.selectedCarac.label + " / " + lvl + "</strong><br>Jet : " +
|
||||
rollData.selectedCarac.value + " / " + rollData.finalLevelStr + " -> " + rolled.score + "%<br><strong>Résutat : </strong>" + result + "<br>" +
|
||||
"<strong>" + quality + "</strong>" + specialStr + xpmsg,
|
||||
content: "<strong>Test : " + rollData.selectedCarac.label + " / " + resumeCompetence + "</strong>"
|
||||
+ "<br>Jet : " + rollData.selectedCarac.value + " / " + rollData.finalLevelStr + " -> " + rolled.score + "%<br><strong>Résutat : </strong>" + rolled.roll
|
||||
+ "<br><strong>" + quality + "</strong>"
|
||||
+ explications + xpmsg,
|
||||
user: game.user._id,
|
||||
title: "Résultat du test"
|
||||
}
|
||||
@ -266,6 +223,81 @@ export class RdDActor extends Actor {
|
||||
}
|
||||
}
|
||||
|
||||
_calculBonusDommages(carac, arme) {
|
||||
const dmgArme = parseInt(arme.data.dommages);
|
||||
const dmgPerso = parseInt(this.data.data.attributs.plusdom.value);
|
||||
if (carac.label == "Tir") {
|
||||
return dmgArme;
|
||||
}
|
||||
if (carac.label == "Lancer") {
|
||||
return dmgArme + Math.min(dmgArme, dmgPerso);
|
||||
}
|
||||
return dmgArme + dmgPerso;
|
||||
}
|
||||
|
||||
async _rollLancementDeSort(rollData, rolled) {
|
||||
|
||||
let sort = duplicate(rollData.selectedSort);
|
||||
|
||||
let closeTMR = true;
|
||||
let coutReve = sort.data.ptreve_reel || sort.data.ptreve; // cas de sort à ptreve variables
|
||||
|
||||
let explications = "<br>Lancement du sort <strong>" + sort.name + "</strong> : " + Misc._upperFirst(sort.data.draconic)
|
||||
+ " pour "+coutReve+ " points de Rêve"
|
||||
+ "<br>Depuis la case " + rollData.coord + " (" + TMRUtility.getTMRDescription(rollData.coord).label + ")";
|
||||
|
||||
let myReve = duplicate(this.data.data.reve.reve);
|
||||
if (rolled.isSuccess) { // Réussite du sort !
|
||||
sort.ptreve_reel = coutReve;
|
||||
if (rolled.isPart) {
|
||||
coutReve = Math.max(Math.ceil(coutReve / 2), 1);
|
||||
}
|
||||
if (myReve.value > coutReve){
|
||||
explications += "<br>Réussite du sort: " + coutReve + " points de Rêve sont dépensés";
|
||||
|
||||
if (rollData.isSortReserve) {
|
||||
// Mise en réserve
|
||||
myReve.value--;
|
||||
await this.sortMisEnReserve(rollData, sort);
|
||||
closeTMR = false;
|
||||
}
|
||||
}
|
||||
else {
|
||||
// Todo 0 pts de reve !!!!
|
||||
explications += "<br>Pas assez de rêve";
|
||||
mergeObject(rollData, RdDResolutionTable.getResultat("echec"));
|
||||
}
|
||||
} else {
|
||||
if (rolled.isETotal) { // Echec total !
|
||||
coutReve *= 2;
|
||||
myReve.value = myReve.value - coutReve;
|
||||
explications += "<br><strong>Echec TOTAL</strong> du sort : " + coutReve + " Points de Rêve";
|
||||
} else {
|
||||
coutReve = 0
|
||||
explications += "<br>Echec du sort !";
|
||||
}
|
||||
}
|
||||
|
||||
myReve.value = Math.max(myReve.value - coutReve, 0);
|
||||
await this.update({ "data.reve.reve": myReve });
|
||||
|
||||
if (myReve.value == 0) { // 0 points de reve
|
||||
ChatMessage.create({ title: "Zero Points de Reve !", content: this.name + " est réduit à 0 Points de Rêve, et tombe endormi !" });
|
||||
closeTMR = true;
|
||||
}
|
||||
if (closeTMR) {
|
||||
this.currentTMR.close(); // Close TMR !
|
||||
}
|
||||
return explications
|
||||
}
|
||||
|
||||
async sortMisEnReserve(rollData, sort) {
|
||||
let reserve = duplicate(this.data.data.reve.reserve);
|
||||
reserve.list.push({ coord: rollData.coord, sort: sort, draconic: duplicate(rollData.selectedDraconic) });
|
||||
await this.update({ "data.reve.reserve": reserve });
|
||||
this.currentTMR.updateSortReserve();
|
||||
}
|
||||
|
||||
/* -------------------------------------------- */
|
||||
updateCarac( caracName, caracValue )
|
||||
{
|
||||
@ -406,13 +438,19 @@ export class RdDActor extends Actor {
|
||||
|
||||
let refoulement = duplicate(this.data.data.reve.refoulement);
|
||||
refoulement.value = refoulement.value + value;
|
||||
|
||||
let total = new Roll("d20").roll().total;
|
||||
if ( total <= refoulement.value ) {
|
||||
ChatMessage.create( { title : "Souffle de Dragon",
|
||||
content: game.user.name + " subit un Souffle de Dragon !" } );
|
||||
refoulement.value = 0;
|
||||
|
||||
let souffle = RdDRollTables.getSouffle();
|
||||
ChatMessage.create( { title : "Souffle de Dragon",
|
||||
content: game.user.name + " subit un Souffle de Dragon : " + souffle.name } );
|
||||
this.actor.createOwnedItem(souffle);
|
||||
|
||||
ret = "souffle";
|
||||
}
|
||||
|
||||
await this.update( {"data.reve.refoulement": refoulement } );
|
||||
return ret;
|
||||
}
|
||||
@ -454,7 +492,7 @@ export class RdDActor extends Actor {
|
||||
/* -------------------------------------------- */
|
||||
async updatePointsDeReve( value ) {
|
||||
let reve = duplicate(this.data.data.reve.reve);
|
||||
reve.value = reve.value + value;
|
||||
reve.value = Math.max(reve.value + value, 0);
|
||||
await this.update( {"data.reve.reve": reve } );
|
||||
}
|
||||
|
||||
@ -635,9 +673,9 @@ export class RdDActor extends Actor {
|
||||
let second = RdDResolutionTable.rollChances(target)
|
||||
switch (second.qualite) {
|
||||
case "part": case "sign":
|
||||
return { factor: 1.5, comment: "Double Particulière (150%) - " + result + " puis " + second }
|
||||
return { factor: 1.5, comment: "Double Particulière (150%) - " + result.roll + " puis " + second.roll }
|
||||
default:
|
||||
return { factor: 1, comment: "Particulière (100%) - " + result + " puis " + second }
|
||||
return { factor: 1, comment: "Particulière (100%) - " + result.roll + " puis " + second.roll }
|
||||
}
|
||||
}
|
||||
|
||||
@ -651,7 +689,7 @@ export class RdDActor extends Actor {
|
||||
etat: this.data.data.compteurs.etat.value,
|
||||
draconicList: draconicList,
|
||||
sortList: sortList,
|
||||
selectedDraconic: draconicList[0],
|
||||
selectedDraconic: this.getBestDraconic(),
|
||||
selectedSort: sortList[0],
|
||||
coord: coord,
|
||||
finalLevel: 0,
|
||||
@ -722,10 +760,10 @@ export class RdDActor extends Actor {
|
||||
}
|
||||
|
||||
/* -------------------------------------------- */
|
||||
async rollCompetence( compName, armeItem=undefined, attackerRoll=undefined )
|
||||
async rollCompetence( name, armeItem=undefined, attackerRoll=undefined )
|
||||
{
|
||||
let compItem = RdDUtility.findCompetence( this.data.items, compName);
|
||||
console.log("!!!!!!", compName, this.data.items, compItem);
|
||||
let competence = RdDUtility.findCompetence( this.data.items, name);
|
||||
console.log("rollCompetence !!!", competence, armeItem, attackerRoll);
|
||||
// Common rollData values
|
||||
let rollData = {
|
||||
bonusmalusTable: CONFIG.RDD.bonusmalus,
|
||||
@ -735,23 +773,23 @@ export class RdDActor extends Actor {
|
||||
finalLevel: 0
|
||||
}
|
||||
|
||||
if ( compItem.type == 'competencecreature') { // Specific case for Creatures
|
||||
if ( compItem.data.iscombat ) {
|
||||
armeItem = { name: compName, data: { dommages: compItem.data.dommages} };
|
||||
if ( competence.type == 'competencecreature') { // Specific case for Creatures
|
||||
if ( competence.data.iscombat ) {
|
||||
armeItem = { name: name, data: { dommages: competence.data.dommages} };
|
||||
}
|
||||
compItem.data.defaut_carac = "carac_creature"; // Fake default competence
|
||||
compItem.data.categorie = "creature"; // Fake default competence
|
||||
rollData.competence = compItem;
|
||||
competence.data.defaut_carac = "carac_creature"; // Fake default competence
|
||||
competence.data.categorie = "creature"; // Fake default competence
|
||||
rollData.competence = competence;
|
||||
rollData.arme = armeItem;
|
||||
rollData.carac = { carac_creature: { label: compName, value: compItem.data.carac_value } };
|
||||
rollData.carac = { carac_creature: { label: name, value: competence.data.carac_value } };
|
||||
} else { // Usual competence
|
||||
rollData.competence = compItem;
|
||||
rollData.competence = competence;
|
||||
rollData.arme = armeItem;
|
||||
rollData.carac = this.data.data.carac;
|
||||
}
|
||||
|
||||
let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-competence.html', rollData);
|
||||
if (armeItem) {
|
||||
if (rollData.arme) {
|
||||
new RdDRollDialog("arme", html, rollData, this ).render(true);
|
||||
} else {
|
||||
new RdDRollDialog("competence", html, rollData, this ).render(true);
|
||||
@ -764,7 +802,6 @@ export class RdDActor extends Actor {
|
||||
let item = this.getOwnedItem(itemID);
|
||||
if ( item && item.data.data ) {
|
||||
let update = {_id: item._id, "data.equipe": !item.data.data.equipe };
|
||||
//console.log(update);
|
||||
await this.updateEmbeddedEntity("OwnedItem", update);
|
||||
this.computeEncombrementTotal(); // Mise à jour encombrement
|
||||
}
|
||||
@ -847,4 +884,7 @@ export class RdDActor extends Actor {
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user