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

Gestion des signes draconiques #455

Closed
vincent.vandeme wants to merge 233 commits from v1.4-signes-draconiques into master
pull from: v1.4-signes-draconiques
merge into: public:master
Conversation 0 Commits 233 Files Changed 243 +69 -65
2 changed files with 69 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7dc1724ab7 - Show all commits

132
module/actor.js
View File

@ -310,22 +310,22 @@ export class RdDActor extends Actor {
getDemiReve() { getDemiReve() {
return Misc.templateData(this).reve.tmrpos.coord; return Misc.templateData(this).reve.tmrpos.coord;
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
async verifierPotionsEnchantees() { async verifierPotionsEnchantees() {
let potionsEnchantees = this.filterItemsData( it => it.type == 'potion' && it.data.categorie.toLowerCase().includes('enchante')); let potionsEnchantees = this.filterItemsData(it => it.type == 'potion' && it.data.categorie.toLowerCase().includes('enchante'));
for ( let potion of potionsEnchantees) { for (let potion of potionsEnchantees) {
if ( !potion.prpermanent) { if (!potion.prpermanent) {
console.log(potion); console.log(potion);
let newPr = (potion.data.pr > 0) ? potion.data.pr - 1 : 0; let newPr = (potion.data.pr > 0) ? potion.data.pr - 1 : 0;
let update = { _id: potion._id, 'data.pr': newPr}; let update = { _id: potion._id, 'data.pr': newPr };
const updated = await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity const updated = await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
let messageData = { let messageData = {
pr : newPr, pr: newPr,
alias : this.name, alias: this.name,
potionName : potion.name, potionName: potion.name,
potionImg : potion.img potionImg: potion.img
} }
ChatMessage.create({ ChatMessage.create({
whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name), whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name),
@ -380,7 +380,7 @@ export class RdDActor extends Actor {
await this._recupereChance(); await this._recupereChance();
await this.transformerStress(); await this.transformerStress();
await this.retourSeuilDeReve(message); await this.retourSeuilDeReve(message);
this.bonusRecuperationPotion= 0; // Reset potion this.bonusRecuperationPotion = 0; // Reset potion
await this.retourSust(message); await this.retourSust(message);
await this.verifierPotionsEnchantees(); await this.verifierPotionsEnchantees();
message.content = `A la fin Chateau Dormant, ${message.content}<br>Un nouveau jour se lève`; message.content = `A la fin Chateau Dormant, ${message.content}<br>Un nouveau jour se lève`;
@ -404,7 +404,7 @@ export class RdDActor extends Actor {
let definition = definitions.find(d => d.type == type); let definition = definitions.find(d => d.type == type);
for (let blessure of liste) { for (let blessure of liste) {
if (blessure.jours >= definition.facteur) { if (blessure.jours >= definition.facteur) {
let rolled = await this._jetRecuperationConstitution(Misc.toInt(blessure.soins_complets)+this.bonusRecuperationPotion, message); let rolled = await this._jetRecuperationConstitution(Misc.toInt(blessure.soins_complets) + this.bonusRecuperationPotion, message);
blessure.soins_complets = 0; blessure.soins_complets = 0;
if (rolled.isSuccess && this._retrograderBlessure(type, blessure, moindres)) { if (rolled.isSuccess && this._retrograderBlessure(type, blessure, moindres)) {
message.content += ` -- une blessure ${type} cicatrise`; message.content += ` -- une blessure ${type} cicatrise`;
@ -2320,7 +2320,7 @@ export class RdDActor extends Actor {
"cout": artData.exotismeFinal < 0 ? 0 : artData.qualiteFinale * 0.01 "cout": artData.exotismeFinal < 0 ? 0 : artData.qualiteFinale * 0.01
} }
}; };
if (artData.ajouterEquipement){ if (artData.ajouterEquipement) {
await this.createEmbeddedDocuments('Item', [platCuisine]); await this.createEmbeddedDocuments('Item', [platCuisine]);
ui.notifications.info(`${platCuisine.data.quantite} rations de ${platCuisine.name} ont été ajoutés à votre équipement`); ui.notifications.info(`${platCuisine.data.quantite} rations de ${platCuisine.name} ont été ajoutés à votre équipement`);
} }
@ -3187,7 +3187,7 @@ export class RdDActor extends Actor {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
async buildPotionGuerisonList( pointsGuerison) { async buildPotionGuerisonList(pointsGuerison) {
let pointsGuerisonInitial = pointsGuerison; let pointsGuerisonInitial = pointsGuerison;
let myData = Misc.templateData(this); let myData = Misc.templateData(this);
const blessures = duplicate(myData.blessures); const blessures = duplicate(myData.blessures);
@ -3195,70 +3195,70 @@ export class RdDActor extends Actor {
console.log(blessures); console.log(blessures);
for (let critique of blessures.critiques.liste) { for (let critique of blessures.critiques.liste) {
if (critique.active && pointsGuerison >= 6 ) { if (critique.active && pointsGuerison >= 6) {
pointsGuerison -= 6; pointsGuerison -= 6;
critique.active = false; critique.active = false;
guerisonData.list.push( "1 Blessure Critique (6 points)"); guerisonData.list.push("1 Blessure Critique (6 points)");
} }
} }
for (let grave of blessures.graves.liste) { for (let grave of blessures.graves.liste) {
if (grave.active && pointsGuerison >= 4 ) { if (grave.active && pointsGuerison >= 4) {
pointsGuerison -= 4; pointsGuerison -= 4;
grave.active = false; grave.active = false;
guerisonData.list.push( "1 Blessure Grave (4 points)"); guerisonData.list.push("1 Blessure Grave (4 points)");
} }
} }
for (let legere of blessures.legeres.liste) { for (let legere of blessures.legeres.liste) {
if (legere.active && pointsGuerison >= 2 ) { if (legere.active && pointsGuerison >= 2) {
pointsGuerison -= 2; pointsGuerison -= 2;
legere.active = false; legere.active = false;
guerisonData.list.push( "1 Blessure Légère (2 points)"); guerisonData.list.push("1 Blessure Légère (2 points)");
} }
} }
await this.update({ "data.blessures": blessures }); await this.update({ "data.blessures": blessures });
let pvManquants = myData.sante.vie.max - myData.sante.vie.value; let pvManquants = myData.sante.vie.max - myData.sante.vie.value;
let pvSoignees = Math.min(pvManquants, Math.floor(pointsGuerison / 2 )); let pvSoignees = Math.min(pvManquants, Math.floor(pointsGuerison / 2));
pointsGuerison -= pvSoignees*2; pointsGuerison -= pvSoignees * 2;
guerisonData.list.push( pvSoignees + " Points de Vie soignés"); guerisonData.list.push(pvSoignees + " Points de Vie soignés");
await this.santeIncDec('vie', +pvSoignees, false); await this.santeIncDec('vie', +pvSoignees, false);
guerisonData.pointsConsommes = pointsGuerisonInitial - pointsGuerison; guerisonData.pointsConsommes = pointsGuerisonInitial - pointsGuerison;
return guerisonData; return guerisonData;
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
async consommerPotionSoin(potionData) { async consommerPotionSoin(potionData) {
potionData.alias = this.name; potionData.alias = this.name;
if (potionData.data.categorie.includes('Enchante')) { if (potionData.data.categorie.includes('Enchante')) {
potionData.pointsGuerison = RdDHerbes.calculePointsGuerison( potionData.data); potionData.pointsGuerison = RdDHerbes.calculePointsGuerison(potionData.data);
potionData.enchanteTexte = "enchantée"; potionData.enchanteTexte = "enchantée";
potionData.isEnchante = true; potionData.isEnchante = true;
ChatMessage.create({ ChatMessage.create({
whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name), whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name),
content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-consommer-potion-soin.html`, potionData ) content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-consommer-potion-soin.html`, potionData)
}); });
// Gestion de la résistance: // Gestion de la résistance:
let rolled = await RdDResolutionTable.roll(this.getReveActuel(), -8 ); let rolled = await RdDResolutionTable.roll(this.getReveActuel(), -8);
potionData.reussiteReve = false; potionData.reussiteReve = false;
if (!rolled.isSuccess) { if (!rolled.isSuccess) {
await this.reveActuelIncDec(-1); await this.reveActuelIncDec(-1);
potionData.guerisonData = await this.buildPotionGuerisonList(potionData.pointsGuerison); potionData.guerisonData = await this.buildPotionGuerisonList(potionData.pointsGuerison);
potionData.guerisonMinutes = potionData.guerisonData.pointsConsommes * 5; potionData.guerisonMinutes = potionData.guerisonData.pointsConsommes * 5;
potionData.reussiteReve = true; potionData.reussiteReve = true;
} }
ChatMessage.create({ ChatMessage.create({
whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name), whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name),
content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-appliquer-potion-soin.html`, potionData ) content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-appliquer-potion-soin.html`, potionData)
}); });
} else { } else {
potionData.enchanteTexte = ""; potionData.enchanteTexte = "";
potionData.isEnchante = false; potionData.isEnchante = false;
ChatMessage.create({ ChatMessage.create({
whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name), whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name),
content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-appliquer-potion-soin.html`, potionData ) content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-appliquer-potion-soin.html`, potionData)
}); });
this.bonusRecuperationPotion = potionData.data.herbeBonus; this.bonusRecuperationPotion = potionData.data.herbeBonus;
} }
} }
@ -3268,27 +3268,27 @@ export class RdDActor extends Actor {
potionData.alias = this.name; potionData.alias = this.name;
if (potionData.data.categorie.includes('Enchante')) { if (potionData.data.categorie.includes('Enchante')) {
potionData.casesRepos = RdDHerbes.calculePointsRepos( potionData.data); potionData.casesRepos = RdDHerbes.calculePointsRepos(potionData.data);
potionData.enchanteTexte = "enchantée"; potionData.enchanteTexte = "enchantée";
potionData.isEnchante = true; potionData.isEnchante = true;
ChatMessage.create({ ChatMessage.create({
whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name), whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name),
content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-consommer-potion-repos.html`, potionData ) content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-consommer-potion-repos.html`, potionData)
}); });
// Gestion de la résistance: // Gestion de la résistance:
let rolled = await RdDResolutionTable.roll(this.getReveActuel(), -8 ); let rolled = await RdDResolutionTable.roll(this.getReveActuel(), -8);
potionData.reussiteReve = false; potionData.reussiteReve = false;
if (!rolled.isSuccess) { if (!rolled.isSuccess) {
await this.reveActuelIncDec(-1); await this.reveActuelIncDec(-1);
let fatigueActuelle = this.getFatigueActuelle(); let fatigueActuelle = this.getFatigueActuelle();
potionData.caseFatigueReel = (fatigueActuelle >= potionData.casesRepos) ? potionData.casesRepos : fatigueActuelle; potionData.caseFatigueReel = (fatigueActuelle >= potionData.casesRepos) ? potionData.casesRepos : fatigueActuelle;
potionData.guerisonDureeUnite = (potionData.data.reposalchimique) ? "rounds" : "minutes"; potionData.guerisonDureeUnite = (potionData.data.reposalchimique) ? "rounds" : "minutes";
potionData.guerisonDureeValue = (potionData.data.reposalchimique) ? potionData.caseFatigueReel : potionData.caseFatigueReel*5; potionData.guerisonDureeValue = (potionData.data.reposalchimique) ? potionData.caseFatigueReel : potionData.caseFatigueReel * 5;
potionData.reussiteReve = true; potionData.reussiteReve = true;
potionData.aphasiePermanente = false; potionData.aphasiePermanente = false;
if ( potionData.data.reposalchimique ) { if (potionData.data.reposalchimique) {
let chanceAphasie = new Roll("1d100").evaluate({async : false} ).total; let chanceAphasie = new Roll("1d100").evaluate({ async: false }).total;
if ( chanceAphasie <= potionData.data.pr ) { if (chanceAphasie <= potionData.data.pr) {
potionData.aphasiePermanente = true; potionData.aphasiePermanente = true;
} }
} }
@ -3296,62 +3296,64 @@ export class RdDActor extends Actor {
} }
ChatMessage.create({ ChatMessage.create({
whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name), whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name),
content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-appliquer-potion-repos.html`, potionData ) content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-appliquer-potion-repos.html`, potionData)
}); });
} else { } else {
potionData.enchanteTexte = ""; potionData.enchanteTexte = "";
potionData.isEnchante = false; potionData.isEnchante = false;
ChatMessage.create({ ChatMessage.create({
whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name), whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name),
content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-appliquer-potion-repos.html`, potionData ) content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-appliquer-potion-repos.html`, potionData)
}); });
this.bonusRepos = potionData.data.herbeBonus; this.bonusRepos = potionData.data.herbeBonus;
} }
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
dialogFabriquerPotion( herbe ) { dialogFabriquerPotion(herbe) {
DialogFabriquerPotion.create(this, herbe, { DialogFabriquerPotion.create(this, herbe, {
html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-fabriquer-potion-base.html', html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-fabriquer-potion-base.html',
}, []); }, []);
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
async fabriquerPotion( potionData ) { async fabriquerPotion(potionData) {
let newPotion = { let newPotion = {
name: `Potion de ${potionData.data.categorie} (${potionData.name})`, type: 'potion', name: `Potion de ${potionData.data.categorie} (${potionData.name})`, type: 'potion',
img: "systems/foundryvtt-reve-de-dragon/icons/objets/fiole_verre.webp", img: "systems/foundryvtt-reve-de-dragon/icons/objets/fiole_verre.webp",
data: { quantite: 1, valeur_deniers: 1, encombrement: 0.01, data: {
quantite: 1, valeur_deniers: 1, encombrement: 0.01,
categorie: potionData.data.categorie, categorie: potionData.data.categorie,
herbe: potionData.name, herbe: potionData.name,
rarete: potionData.data.rarete, rarete: potionData.data.rarete,
herbebrins: potionData.nbBrins, herbebrins: potionData.nbBrins,
description: "" } description: ""
}
} }
await this.createEmbeddedDocuments('Item', [newPotion], { renderSheet: true }); await this.createEmbeddedDocuments('Item', [newPotion], { renderSheet: true });
let newQuantite = potionData.data.quantite - potionData.nbBrins; let newQuantite = potionData.data.quantite - potionData.nbBrins;
let messageData = { let messageData = {
alias: this.name, alias: this.name,
categorie: potionData.data.categorie, categorie: potionData.data.categorie,
herbe: potionData.name, herbe: potionData.name,
nbBrinsPotion: potionData.nbBrins, nbBrinsPotion: potionData.nbBrins,
nbBrinsReste: newQuantite nbBrinsReste: newQuantite
} }
if (newQuantite == 0 ) { if (newQuantite == 0) {
await this.deleteEmbeddedDocuments('Item', [ potionData._id ] ); await this.deleteEmbeddedDocuments('Item', [potionData._id]);
} else { } else {
let update = { _id: potionData._id, 'data.quantite': newQuantite}; let update = { _id: potionData._id, 'data.quantite': newQuantite };
await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
} }
ChatMessage.create({ ChatMessage.create({
whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name), whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name),
content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-fabriquer-potion-base.html`, messageData ) content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-fabriquer-potion-base.html`, messageData)
}); });
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
async consommerPotionGenerique( potionData ) { async consommerPotionGenerique(potionData) {
potionData.alias = this.name; potionData.alias = this.name;
if (potionData.data.categorie.includes('Enchante')) { if (potionData.data.categorie.includes('Enchante')) {
@ -3363,22 +3365,22 @@ export class RdDActor extends Actor {
} }
ChatMessage.create({ ChatMessage.create({
whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name), whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name),
content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-consommer-potion-generique.html`, potionData ) content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-consommer-potion-generique.html`, potionData)
}); });
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
async consommerPotion( potion ) { async consommerPotion(potion) {
const potionData = Misc.data(potion); const potionData = Misc.data(potion);
if ( potionData.data.categorie.includes('Soin')) { if (potionData.data.categorie.includes('Soin')) {
this.consommerPotionSoin( potionData); this.consommerPotionSoin(potionData);
} else if( potionData.data.categorie.includes('Repos')) { } else if (potionData.data.categorie.includes('Repos')) {
this.consommerPotionRepos(potionData); this.consommerPotionRepos(potionData);
} else { } else {
this.consommerPotionGenerique(potionData); this.consommerPotionGenerique(potionData);
} }
await this.deleteEmbeddedDocuments('Item', [ potion.id ] ); await this.deleteEmbeddedDocuments('Item', [potion.id]);
} }
/* -------------------------------------------- */ /* -------------------------------------------- */

2
module/item.js
View File

@ -9,9 +9,11 @@ export class RdDItem extends Item {
static getTypeObjetsEquipement() { static getTypeObjetsEquipement() {
return typesObjetsEquipement; return typesObjetsEquipement;
} }
static getTypesOeuvres() { static getTypesOeuvres() {
return typesObjetsOeuvres; return typesObjetsOeuvres;
} }
prepareDerivedData() { prepareDerivedData() {
super.prepareDerivedData(); super.prepareDerivedData();
const itemData = this.data; const itemData = this.data;