forked from public/foundryvtt-reve-de-dragon
Cleanup compendium et monnaies
This commit is contained in:
Vincent Vandemeulebrouck
131
module/actor.js
131
module/actor.js
@ -26,6 +26,7 @@ import { Poetique } from "./poetique.js";
|
||||
import { EffetsDraconiques } from "./tmr/effets-draconiques.js";
|
||||
import { Draconique } from "./tmr/draconique.js";
|
||||
import { RdDCarac } from "./rdd-carac.js";
|
||||
import { Monnaie } from "./item-monnaie.js";
|
||||
|
||||
|
||||
/* -------------------------------------------- */
|
||||
@ -56,36 +57,25 @@ export class RdDActor extends Actor {
|
||||
*/
|
||||
|
||||
static async create(data, options) {
|
||||
|
||||
// Case of compendium global import
|
||||
if (data instanceof Array) {
|
||||
return super.create(data, options);
|
||||
}
|
||||
|
||||
const isPersonnage = data.type == "personnage";
|
||||
// If the created actor has items (only applicable to duplicated actors) bypass the new actor creation logic
|
||||
if (data.items) {
|
||||
let actor = super.create(data, options);
|
||||
if (data.type == "personnage") {
|
||||
if (isPersonnage) {
|
||||
await actor.checkMonnaiePresence(data.items);
|
||||
}
|
||||
return actor;
|
||||
}
|
||||
|
||||
let compendiumName;
|
||||
if (data.type == "personnage") {
|
||||
compendiumName = "foundryvtt-reve-de-dragon.competences";
|
||||
} else if (data.type == "creature") {
|
||||
compendiumName = "foundryvtt-reve-de-dragon.competences-creatures";
|
||||
} else if (data.type == "entite") {
|
||||
compendiumName = "foundryvtt-reve-de-dragon.competences-entites";
|
||||
data.items = await RdDUtility.loadCompendium(RdDItemCompetence.actorCompendium(data.type));
|
||||
if (isPersonnage) {
|
||||
data.items = data.items.concat(Monnaie.monnaiesData());
|
||||
}
|
||||
if (compendiumName) {
|
||||
data.items = await RdDUtility.loadCompendium(compendiumName);
|
||||
}
|
||||
// Ajout monnaie
|
||||
if (data.type == "personnage" && data.items) {
|
||||
await RdDActor.ajouterMonnaie(data.items);
|
||||
}
|
||||
|
||||
return super.create(data, options);
|
||||
}
|
||||
|
||||
@ -151,41 +141,10 @@ export class RdDActor extends Actor {
|
||||
/* -------------------------------------------- */
|
||||
async checkMonnaiePresence(items) { // Ajout opportuniste si les pièces n'existent pas.
|
||||
if (!items) return; // Sanity check during import
|
||||
let piece = items.find(item => item.type == 'monnaie' && Number(item.data.valeur_deniers) == 1);
|
||||
let newMonnaie = [];
|
||||
if (!piece) {
|
||||
newMonnaie.push(RdDUtility.createMonnaie("Etain (1 denier)", 1, "systems/foundryvtt-reve-de-dragon/icons/objets/piece_etain_poisson.webp"));
|
||||
let manquantes = Monnaie.monnaiesManquantes(items);
|
||||
if (manquantes.length > 0) {
|
||||
await this.createOwnedItem(manquantes);
|
||||
}
|
||||
piece = items.find(item => item.type == 'monnaie' && Number(item.data.valeur_deniers) == 10);
|
||||
if (!piece) {
|
||||
newMonnaie.push(RdDUtility.createMonnaie("Bronze (10 deniers)", 10, "systems/foundryvtt-reve-de-dragon/icons/objets/piece_bronze_epees.webp"));
|
||||
}
|
||||
piece = items.find(item => item.type == 'monnaie' && Number(item.data.valeur_deniers) == 100);
|
||||
if (!piece) {
|
||||
newMonnaie.push(RdDUtility.createMonnaie("Argent (1 sol)", 100, "systems/foundryvtt-reve-de-dragon/icons/objets/piece_argent_sol.webp"));
|
||||
}
|
||||
piece = items.find(item => item.type == 'monnaie' && Number(item.data.valeur_deniers) == 1000);
|
||||
if (!piece) {
|
||||
newMonnaie.push(RdDUtility.createMonnaie("Or (10 sols)", 1000, "systems/foundryvtt-reve-de-dragon/icons/objets/piece_or_sol.webp"));
|
||||
}
|
||||
if (newMonnaie.length > 0) {
|
||||
await this.createOwnedItem(newMonnaie);
|
||||
}
|
||||
}
|
||||
|
||||
/* -------------------------------------------- */
|
||||
static async ajouterMonnaie(items) { // Creation auto à la création du personnage
|
||||
let etain = RdDUtility.createMonnaie("Etain (1 denier)", 1, "systems/foundryvtt-reve-de-dragon/icons/objets/piece_etain_poisson.webp");
|
||||
items.push(etain);
|
||||
|
||||
let bronze = RdDUtility.createMonnaie("Bronze (10 deniers)", 10, "systems/foundryvtt-reve-de-dragon/icons/objets/piece_bronze_epees.webp");
|
||||
items.push(bronze);
|
||||
|
||||
let argent = RdDUtility.createMonnaie("Argent (1 sol)", 100, "systems/foundryvtt-reve-de-dragon/icons/objets/piece_argent_sol.webp");
|
||||
items.push(argent);
|
||||
|
||||
let or = RdDUtility.createMonnaie("Or (10 sols)", 1000, "systems/foundryvtt-reve-de-dragon/icons/objets/piece_or_sol.webp");
|
||||
items.push(or);
|
||||
}
|
||||
|
||||
/* -------------------------------------------- */
|
||||
@ -1774,7 +1733,7 @@ export class RdDActor extends Actor {
|
||||
if (!rollData.useMoral) return;
|
||||
if (rollData.rolled.isEchec ||
|
||||
(rollData.ajustements.diviseurSignificative && (rollData.rolled.roll * rollData.ajustements.diviseurSignificative > rollData.score))) {
|
||||
rollData.perteMoralEchec = rollData.moral<=-3? 'dissolution' : 'perte';
|
||||
rollData.perteMoralEchec = rollData.moral <= -3 ? 'dissolution' : 'perte';
|
||||
rollData.moral = await this.moralIncDec(-1); /* L'appel au moral a échoué. Le personnage perd un point de moral */
|
||||
}
|
||||
}
|
||||
@ -2863,42 +2822,29 @@ export class RdDActor extends Actor {
|
||||
return;
|
||||
}
|
||||
/* -------------------------------------------- */
|
||||
async optimizeArgent(sumDenier) {
|
||||
let sols = Math.floor(sumDenier / 100);
|
||||
let deniers = sumDenier - (sols * 100);
|
||||
let nbOr = Math.floor(sols / 10);
|
||||
let nbArgent = sols - (nbOr * 10);
|
||||
let nbBronze = Math.floor(deniers / 10);
|
||||
let nbEtain = deniers - (nbBronze * 10);
|
||||
async optimizeArgent(sumDenier, monnaies) {
|
||||
|
||||
// console.log("ARGENT", nbOr, nbArgent, nbBronze, nbEtain);
|
||||
let piece = this.data.items.find(item => item.type == 'monnaie' && item.data.valeur_deniers == 1000);
|
||||
if (piece) {
|
||||
let update = { _id: piece._id, 'data.quantite': nbOr };
|
||||
const updated = await this.updateEmbeddedEntity("OwnedItem", update);
|
||||
let parValeur = Misc.classifyFirst(monnaies, it => it.data.valeur_deniers);
|
||||
let fortune = {
|
||||
1000: Math.floor(sumDenier / 1000), // or
|
||||
100: Math.floor(sumDenier / 100) % 10, // argent
|
||||
10: Math.floor(sumDenier / 10) % 10, // bronze
|
||||
1: sumDenier % 10 // étain
|
||||
}
|
||||
|
||||
piece = this.data.items.find(item => item.type == 'monnaie' && item.data.valeur_deniers == 100);
|
||||
if (piece) {
|
||||
let update = { _id: piece._id, 'data.quantite': nbArgent };
|
||||
const updated = await this.updateEmbeddedEntity("OwnedItem", update);
|
||||
}
|
||||
|
||||
piece = this.data.items.find(item => item.type == 'monnaie' && item.data.valeur_deniers == 10);
|
||||
if (piece) {
|
||||
let update = { _id: piece._id, 'data.quantite': nbBronze };
|
||||
const updated = await this.updateEmbeddedEntity("OwnedItem", update);
|
||||
}
|
||||
|
||||
piece = this.data.items.find(item => item.type == 'monnaie' && item.data.valeur_deniers == 1);
|
||||
if (piece) {
|
||||
let update = { _id: piece._id, 'data.quantite': nbEtain };
|
||||
const updated = await this.updateEmbeddedEntity("OwnedItem", update);
|
||||
for (const [valeur, nombre] of Object.entries(fortune)) {
|
||||
let piece = parValeur[valeur];
|
||||
await this.updateEmbeddedEntity("OwnedItem", { _id: piece._id, 'data.quantite': nombre });
|
||||
}
|
||||
}
|
||||
|
||||
/* -------------------------------------------- */
|
||||
async payerDenier(sumDenier, dataObj = undefined, quantite = 1) {
|
||||
let monnaies = Monnaie.filtrerMonnaies(this.data.items);
|
||||
if (monnaies.length < 4) {
|
||||
ui.notifications.warn("Problème de monnaies manquantes, impossible de payer correctement!")
|
||||
return;
|
||||
}
|
||||
|
||||
sumDenier = Number(sumDenier);
|
||||
let denierDisponible = 0;
|
||||
|
||||
@ -2912,19 +2858,18 @@ export class RdDActor extends Actor {
|
||||
let isPayed = false;
|
||||
if (denierDisponible >= sumDenier) {
|
||||
denierDisponible -= sumDenier;
|
||||
this.optimizeArgent(denierDisponible);
|
||||
this.optimizeArgent(denierDisponible, monnaies);
|
||||
msg = `Vous avez payé <strong>${sumDenier} Deniers</strong>, qui ont été soustraits de votre argent.`;
|
||||
RdDAudio.PlayContextAudio("argent"); // Petit son
|
||||
isPayed = true;
|
||||
if (dataObj) {
|
||||
dataObj.payload.data.cout = sumDenier / 100; // Mise à jour du prix en sols , avec le prix acheté
|
||||
dataObj.payload.data.quantite = quantite;
|
||||
await this.createOwnedItem(dataObj.payload);
|
||||
msg += `<br>Et l'objet <strong>${dataObj.payload.name}</strong> a été ajouté à votre inventaire.`;
|
||||
}
|
||||
} else {
|
||||
msg = "Vous n'avez pas assez d'argent pour paye cette somme !";
|
||||
}
|
||||
|
||||
if (dataObj && isPayed) {
|
||||
dataObj.payload.data.cout = sumDenier / 100; // Mise à jour du prix en sols , avec le prix acheté
|
||||
dataObj.payload.data.quantite = quantite;
|
||||
await this.createOwnedItem(dataObj.payload);
|
||||
msg += `<br>Et l'objet <strong>${dataObj.payload.name}</strong> a été ajouté à votre inventaire.`;
|
||||
msg = "Vous n'avez pas assez d'argent pour payer cette somme !";
|
||||
}
|
||||
|
||||
let message = {
|
||||
@ -2938,10 +2883,8 @@ export class RdDActor extends Actor {
|
||||
async monnaieIncDec(id, value) {
|
||||
let monnaie = this.data.items.find(item => item.type == 'monnaie' && item._id == id);
|
||||
if (monnaie) {
|
||||
monnaie.data.quantite += value;
|
||||
if (monnaie.data.quantite < 0) monnaie.data.quantite = 0; // Sanity check
|
||||
const update = { _id: monnaie._id, 'data.quantite': monnaie.data.quantite };
|
||||
const updated = await this.updateEmbeddedEntity("OwnedItem", update);
|
||||
const quantite = Math.max(0, monnaie.data.quantite + value);
|
||||
await this.updateEmbeddedEntity("OwnedItem", { _id: monnaie._id, 'data.quantite': quantite });
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user