${this.name} vient de succomber à une seconde blessure critique ! Que les Dragons gardent son Archétype en paix !`
@@ -4117,61 +4096,44 @@ export class RdDActor extends Actor {
async onUpdateActor(update, options, actorId) {
const updatedEndurance = update?.system?.sante?.endurance
if (updatedEndurance && options.diff) {
- await this.setStatusEffect("EFFECT.StatusUnconscious", updatedEndurance.value == 0)
+ await this.setEffect(STATUSES.StatusUnconscious, updatedEndurance.value == 0)
}
}
/* -------------------------------------------- */
- async onDeleteActiveEffect(effect, options) {
- switch (effect.label) {
- case 'EFFECT.StatusStunned':
- return;
- }
+ getEffects() {
+ return this.getEmbeddedCollection("ActiveEffect");
}
/* -------------------------------------------- */
- getActiveEffects(matching = it => true) {
- return Array.from(this.getEmbeddedCollection("ActiveEffect").values()).filter(it => matching(it));
+ getEffect(statusId) {
+ return this.getEmbeddedCollection("ActiveEffect").find(it => it.flags?.core?.statusId == statusId);
}
/* -------------------------------------------- */
- getEffectByLabel(label) {
- return this.getActiveEffects().find(it => it.system?.label == label);
- }
-
- /* -------------------------------------------- */
- getEffectById(id) {
- return this.getActiveEffects().find(it => it.id == id);
- }
-
- /* -------------------------------------------- */
- async setStatusEffect(label, status, updates = {}) {
+ async setEffect(statusId, status) {
if (this.isEntite() || this.type == 'vehicule') {
return;
}
- console.log("setStatusEffect", label, status, updates)
- const existing = this.getEffectByLabel(label);
- if (existing) {
- existing.delete();
- }
- if (status) {
- const statusEffect = mergeObject(duplicate(StatusEffects.status(label)), updates);
- await this.createEmbeddedDocuments("ActiveEffect", [statusEffect]);
+ console.log("setEffect", statusId, status)
+ await this.removeEffect(statusId);
+ const effect = StatusEffects.status(statusId);
+ if (effect) {
+ await this.createEmbeddedDocuments("ActiveEffect", [effect]);
}
}
- enleverActiveEffectById(id) {
- if (game.user.isGM) {
- const existing = this.getEffectById(id);
- if (existing) {
- existing.delete();
- }
+ async removeEffect(statusId) {
+ const effect = this.getEffect(statusId);
+ if (effect) {
+ await this.deleteEmbeddedDocuments('ActiveEffect', [effect.id]);
}
}
+
/* -------------------------------------------- */
enleverTousLesEffets() {
if (game.user.isGM) {
- this.deleteEmbeddedDocuments('ActiveEffect', this.getActiveEffects().map(it => it.id));
+ this.deleteEmbeddedDocuments('ActiveEffect', this.getEffects().map(it => it.id));
}
}
diff --git a/module/constants.js b/module/constants.js
index 675749ed..2861889b 100644
--- a/module/constants.js
+++ b/module/constants.js
@@ -1,5 +1,6 @@
export const SYSTEM_RDD = 'foundryvtt-reve-de-dragon';
export const SYSTEM_SOCKET_ID = 'system.foundryvtt-reve-de-dragon';
+export const LOG_HEAD = 'RdD | ';
export const HIDE_DICE = 'hide';
export const SHOW_DICE = 'show';
diff --git a/module/item-sheet.js b/module/item-sheet.js
index 933b4642..ee2abc4a 100644
--- a/module/item-sheet.js
+++ b/module/item-sheet.js
@@ -84,32 +84,36 @@ export class RdDItemSheet extends ItemSheet {
}
formData.categorieCompetences = RdDItemCompetence.getCategorieCompetences()
- if (formData.type == 'tache' || formData.type == 'livre' || formData.type == 'meditation' || formData.type == 'oeuvre') {
+ if (this.item.type == 'tache' || this.item.type == 'livre' || this.item.type == 'meditation' || this.item.type == 'oeuvre') {
formData.caracList = duplicate(game.system.model.Actor.personnage.carac)
formData.caracList["reve-actuel"] = duplicate(game.system.model.Actor.personnage.reve.reve)
formData.competences = await RdDUtility.loadCompendium('foundryvtt-reve-de-dragon.competences')
}
- if (formData.type == 'arme') {
+ if (this.item.type == 'arme') {
formData.competences = await RdDUtility.loadCompendium('foundryvtt-reve-de-dragon.competences', it => RdDItemCompetence.isCompetenceArme(it));
console.log(formData.competences)
}
- if (formData.type == 'recettealchimique') {
+ if (this.item.type == 'recettealchimique') {
RdDAlchimie.processManipulation(this.item, this.actor && this.actor.id);
}
- if (formData.type == 'gemme') {
+ if (this.item.type == 'gemme') {
formData.gemmeTypeList = RdDGemme.getGemmeTypeOptionList();
RdDGemme.calculDataDerivees(this.item);
}
- if (formData.type == 'potion') {
+ if (this.item.type == 'potion') {
if (this.dateUpdated) {
formData.system.prdate = this.dateUpdated;
this.dateUpdated = undefined;
}
RdDHerbes.updatePotionData(formData);
}
- if (formData.isOwned && formData.type == 'herbe' && (formData.system.categorie == 'Soin' || formData.system.categorie == 'Repos')) {
+ if (formData.isOwned && this.item.type == 'herbe' && (formData.system.categorie == 'Soin' || formData.system.categorie == 'Repos')) {
formData.isIngredientPotionBase = true;
}
+ if (this.item.type == 'sortreserve') {
+ const sortId = this.item.system.sortid;
+ formData.sort = formData.isOwned ? this.item.actor.items.get(sortId) : game.items.get(sortId);
+ }
formData.bonusCaseList = RdDItemSort.getBonusCaseList(formData, true);
return formData;
diff --git a/module/item.js b/module/item.js
index 7f9003d8..3e8a8cd9 100644
--- a/module/item.js
+++ b/module/item.js
@@ -36,7 +36,8 @@ export const defaultItemImg = {
nourritureboisson: "systems/foundryvtt-reve-de-dragon/icons/objets/provision_crue.webp",
signedraconique: "systems/foundryvtt-reve-de-dragon/icons/tmr/signe_draconique.webp",
gemme: "systems/foundryvtt-reve-de-dragon/icons/gemmes/almaze.webp",
- possession: "systems/foundryvtt-reve-de-dragon/icons/entites/possession2.webp"
+ possession: "systems/foundryvtt-reve-de-dragon/icons/entites/possession2.webp",
+ sortreserve: "systems/foundryvtt-reve-de-dragon/icons/competence_oniros.webp",
}
/* -------------------------------------------- */
diff --git a/module/migrations.js b/module/migrations.js
new file mode 100644
index 00000000..9bd75d62
--- /dev/null
+++ b/module/migrations.js
@@ -0,0 +1,103 @@
+import { LOG_HEAD, SYSTEM_RDD } from "./constants.js";
+
+class Migration {
+ get code() { return "sample"; }
+ get version() { return "0.0.0"; }
+ async migrate() { }
+}
+
+class _10_0_16_MigrationSortsReserve extends Migration {
+ get code() { return "creation-item-sort-reserve"; }
+ get version() { return "10.0.16"; }
+
+ async migrate() {
+ await game.actors
+ .filter((actor) => actor.type == "personnage")
+ .filter((actor) => actor.system.reve?.reserve?.list?.length ?? 0 > 0)
+ .forEach(async (actor) => {
+ const sortsReserve = actor.system.reve.reserve.list.map(this.conversionSortReserve);
+ console.log(LOG_HEAD + "Migration des sorts ", sortsReserve);
+ await actor.createEmbeddedDocuments("Item", sortsReserve, {
+ renderSheet: false,
+ });
+ await actor.update({'system.reve.reserve.list':[]})
+ });
+ }
+
+ conversionSortReserve(it) {
+ return {
+ type: 'sortreserve',
+ name: it.sort.name,
+ img: it.sort.img,
+ system: {
+ // ATTENTION, utilisation de data / _id possibles, encore présents pour les anciens sorts en réserve
+ sortid: it.sort._id,
+ draconic: it.sort.draconic,
+ ptreve: (it.sort.system ?? it.sort.data).ptreve_reel,
+ coord: it.coord,
+ heurecible: 'Vaisseau',
+ },
+ };
+ }
+}
+
+export class Migrations {
+ static getMigrations() {
+ return [
+ new _10_0_16_MigrationSortsReserve()
+ ];
+ }
+
+ constructor() {
+ game.settings.register(SYSTEM_RDD, "systemMigrationVersion", {
+ name: "System Migration Version",
+ scope: "world",
+ config: false,
+ type: String,
+ default: "0.0.0",
+ });
+ }
+
+ migrate() {
+ const currentVersion = game.settings.get(
+ SYSTEM_RDD,
+ "systemMigrationVersion"
+ );
+ if (isNewerVersion(game.system.version, currentVersion)) {
+ const migrations = Migrations.getMigrations().filter(m => isNewerVersion(m.version, currentVersion));
+ // if (true) {
+ // const migrations = Migrations.getMigrations();
+ if (migrations.length > 0) {
+ migrations.sort((a, b) =>
+ isNewerVersion(a.version, b.version)
+ ? 1
+ : isNewerVersion(b.version, a.version)
+ ? -1
+ : 0
+ );
+ migrations.forEach(async (m) => {
+ ui.notifications.info(
+ `Executing migration ${m.code}: version ${currentVersion} is lower than ${m.version}`
+ );
+ await m.migrate();
+ });
+ ui.notifications.info(
+ `Migrations done, version will change to ${game.system.version}`
+ );
+ } else {
+ console.log(
+ LOG_HEAD +
+ `No migration needeed, version will change to ${game.system.version}`
+ );
+ }
+
+ game.settings.set(
+ SYSTEM_RDD,
+ "systemMigrationVersion",
+ game.system.version
+ );
+ } else {
+ console.log(LOG_HEAD + `No system version changed`);
+ }
+ }
+}
diff --git a/module/rdd-combat.js b/module/rdd-combat.js
index fee00988..30456d43 100644
--- a/module/rdd-combat.js
+++ b/module/rdd-combat.js
@@ -10,6 +10,7 @@ import { RdDResolutionTable } from "./rdd-resolution-table.js";
import { RdDRoll } from "./rdd-roll.js";
import { RdDRollTables } from "./rdd-rolltables.js";
import { ReglesOptionelles } from "./regles-optionelles.js";
+import { STATUSES } from "./status-effects.js";
/* -------------------------------------------- */
const premierRoundInit = [
@@ -1185,7 +1186,7 @@ export class RdDCombat {
defenderRoll.show.recul = 'encaisse';
} else if (rollRecul.rolled.isETotal || this._isReculCauseChute(impact)) {
defenderRoll.show.recul = 'chute';
- await this.defender.setStatusEffect("EFFECT.StatusProne", true);
+ await this.defender.setEffect(STATUSES.StatusProne, true);
}
else {
defenderRoll.show.recul = 'recul';
diff --git a/module/rdd-main.js b/module/rdd-main.js
index a01bc08c..cfb87b59 100644
--- a/module/rdd-main.js
+++ b/module/rdd-main.js
@@ -35,6 +35,7 @@ import { RdDDice } from "./rdd-dice.js";
import { RdDPossession } from "./rdd-possession.js";
import { RdDSigneDraconiqueItemSheet } from "./item-signedraconique-sheet.js";
import { Misc } from "./misc.js";
+import { Migrations } from './migrations.js';
/* -------------------------------------------- */
/* Foundry VTT Initialization */
@@ -183,7 +184,7 @@ Hooks.once("init", async function () {
Items.registerSheet(SYSTEM_RDD, RdDItemSheet, {
types: ["arme", "armure", "objet", "arme", "armure", "conteneur", "competence", "sort", "herbe", "ingredient", "livre", "potion", "munition", "rencontresTMR", "queue", "ombre", "souffle",
"tete", "competencecreature", "tarot", "monnaie", "nombreastral", "tache", "meditation", "casetmr", "recettealchimique", "gemme",
- "musique", "chant", "danse", "jeu", "recettecuisine", "maladie", "poison", "oeuvre", "nourritureboisson", "possession"], makeDefault: true
+ "musique", "chant", "danse", "jeu", "recettecuisine", "maladie", "poison", "oeuvre", "nourritureboisson", "possession", "sortreserve"], makeDefault: true
});
CONFIG.Combat.documentClass = RdDCombatManager;
@@ -245,6 +246,9 @@ function registerUsageCount( registerKey ) {
/* -------------------------------------------- */
Hooks.once("ready", async function () {
await migrationPngWebp_1_5_34()
+ if (Misc.isUniqueConnectedGM()) {
+ new Migrations().migrate();
+ }
StatusEffects.onReady();
RdDHerbes.initializeHerbes();
diff --git a/module/rdd-tmr-dialog.js b/module/rdd-tmr-dialog.js
index fce54383..7ff6d0c3 100644
--- a/module/rdd-tmr-dialog.js
+++ b/module/rdd-tmr-dialog.js
@@ -1,4 +1,3 @@
-import { SYSTEM_SOCKET_ID } from "./constants.js";
import { RollDataAjustements } from "./rolldata-ajustements.js";
import { RdDUtility } from "./rdd-utility.js";
import { TMRUtility } from "./tmr-utility.js";
@@ -16,6 +15,7 @@ import { Misc } from "./misc.js";
import { HtmlUtility } from "./html-utility.js";
import { ReglesOptionelles } from "./regles-optionelles.js";
import { RdDDice } from "./rdd-dice.js";
+import { STATUSES } from "./status-effects.js";
/* -------------------------------------------- */
export class RdDTMRDialog extends Dialog {
@@ -55,7 +55,6 @@ export class RdDTMRDialog extends Dialog {
this.fatigueParCase = this.viewOnly || !ReglesOptionelles.isUsing("appliquer-fatigue") ? 0 : this.actor.getTMRFatigue();
this.cumulFatigue = 0;
this.loadRencontres();
- this.loadSortsReserve();
this.loadCasesSpeciales();
this.allTokens = [];
this.rencontreState = 'aucune';
@@ -81,9 +80,16 @@ export class RdDTMRDialog extends Dialog {
this.casesSpeciales = this.actor.items.filter(item => Draconique.isCaseTMR(item));
}
- /* -------------------------------------------- */
- loadSortsReserve() {
- this.sortsReserves = this.actor.system.reve.reserve.list;
+ get sortsReserve() {
+ return this.actor.itemTypes['sortreserve'];
+ }
+
+ getSortsReserve(coord) {
+ return this.actor.itemTypes['sortreserve'].filter(// Reserve sur une case fleuve ou normale
+ TMRUtility.getTMR(coord).type == 'fleuve'
+ ? it => TMRUtility.getTMR(it.system.coord).type == 'fleuve'
+ : it => it.system.coord == coord
+ );
}
/* -------------------------------------------- */
@@ -97,10 +103,10 @@ export class RdDTMRDialog extends Dialog {
this.updateTokens();
this.forceDemiRevePositionView();
}
-
+
/* -------------------------------------------- */
_createTokens() {
- if (!this.isDemiReveCache()){
+ if (!this.isDemiReveCache()) {
this.demiReve = this._tokenDemiReve();
this._trackToken(this.demiReve);
}
@@ -117,7 +123,6 @@ export class RdDTMRDialog extends Dialog {
updateTokens() {
this._removeTokens(t => true);
this.loadRencontres();
- this.loadSortsReserve();
this.loadCasesSpeciales();
this._createTokens();
}
@@ -136,7 +141,7 @@ export class RdDTMRDialog extends Dialog {
return this.rencontresExistantes.map(it => this._tokenRencontre(it));
}
_getTokensSortsReserve() {
- return this.sortsReserves.map(it => this._tokenSortEnReserve(it));
+ return this.actor.itemTypes['sortreserve'].map(it => this._tokenSortEnReserve(it));
}
/* -------------------------------------------- */
@@ -148,8 +153,8 @@ export class RdDTMRDialog extends Dialog {
const draconique = Draconique.get(caseData.system.specific);
return draconique?.token(this.pixiTMR, caseData, () => caseData.system.coord);
}
- _tokenSortEnReserve(sortEnReserve) {
- return EffetsDraconiques.sortReserve.token(this.pixiTMR, sortEnReserve.sort, () => sortEnReserve.coord);
+ _tokenSortEnReserve(sortReserve) {
+ return EffetsDraconiques.sortReserve.token(this.pixiTMR, sortReserve, () => sortReserve.system.coord);
}
_tokenDemiReve() {
@@ -254,9 +259,9 @@ export class RdDTMRDialog extends Dialog {
let tmrpos = document.getElementById("tmr-pos");
if (this.isDemiReveCache()) {
- tmrpos.innerHTML = '?? (' + TMRUtility.getTMRType(coord) + ')';
+ tmrpos.innerHTML = `?? ( ${ TMRUtility.getTMRType(coord)})`;
} else {
- tmrpos.innerHTML = coord + " (" + TMRUtility.getTMRLabel(coord) + ")";
+ tmrpos.innerHTML = `${coord} ( ${TMRUtility.getTMRLabel(coord)})`;
}
let etat = document.getElementById("tmr-etatgeneral-value");
@@ -272,15 +277,16 @@ export class RdDTMRDialog extends Dialog {
}
/* -------------------------------------------- */
- close() {
- if ( this.actor.tmrApp ) {
+ async close() {
+ if (this.actor.tmrApp) {
this.actor.tmrApp = undefined; // Cleanup reference
- if ( !this.viewOnly ) {
- this.actor.setStatusEffect("EFFECT.StatusDemiReve", false);
+ if (!this.viewOnly) {
+ await this.actor.setEffect(STATUSES.StatusDemiReve, false)
this._tellToGM(this.actor.name + " a quitté les terres médianes");
}
- this.actor.santeIncDec("fatigue", this.cumulFatigue).then(super.close()); // moving 1 cell costs 1 fatigue
+ await this.actor.santeIncDec("fatigue", this.cumulFatigue)
}
+ await super.close(); // moving 1 cell costs 1 fatigue
}
/* -------------------------------------------- */
@@ -316,11 +322,11 @@ export class RdDTMRDialog extends Dialog {
this.currentRencontre.graphics = []; // Keep track of rectangles to delete it
this.currentRencontre.locList = duplicate(listCoordTMR); // And track of allowed location
for (let coordTMR of listCoordTMR) {
- let rect = this._getCaseRectangleCoord(coordTMR);
- var rectDraw = new PIXI.Graphics();
- rectDraw.beginFill(0xFFFF00, 0.3);
+ const rect = this._getCaseRectangleCoord(coordTMR);
+ const rectDraw = new PIXI.Graphics();
+ rectDraw.beginFill(0xffff00, 0.3);
// set the line style to have a width of 5 and set the color to red
- rectDraw.lineStyle(5, 0xFF0000);
+ rectDraw.lineStyle(5, 0xff0000);
// draw a rectangle
rectDraw.drawRect(rect.x, rect.y, rect.w, rect.h);
this.pixiApp.stage.addChild(rectDraw);
@@ -336,19 +342,13 @@ export class RdDTMRDialog extends Dialog {
/* -------------------------------------------- */
async choisirCasePortee(coord, portee) {
- if (this.actor.isTMRCache())
- {
- return;
- }
// Récupère la liste des cases à portées
- let locList = TMRUtility.getTMRPortee(coord, portee);
- this.colorierZoneRencontre(locList);
+ this.colorierZoneRencontre(TMRUtility.getTMRPortee(coord, portee));
}
/* -------------------------------------------- */
async choisirCaseType(type) {
- const locList = TMRUtility.filterTMR(it => it.type == type).map(it => it.coord);
- this.colorierZoneRencontre(locList);
+ this.colorierZoneRencontre(TMRUtility.filterTMR(it => it.type == type).map(it => it.coord));
}
/* -------------------------------------------- */
@@ -573,6 +573,9 @@ export class RdDTMRDialog extends Dialog {
/* -------------------------------------------- */
async manageTmrInnaccessible(tmr) {
+ if (!tmr) {
+ return await this.actor.reinsertionAleatoire('Sortie de carte');
+ }
const caseTmrInnaccessible = this.casesSpeciales.find(c => EffetsDraconiques.isInnaccessible(c, tmr.coord));
if (caseTmrInnaccessible) {
return await this.actor.reinsertionAleatoire(caseTmrInnaccessible.name);
@@ -774,9 +777,8 @@ export class RdDTMRDialog extends Dialog {
/* -------------------------------------------- */
async declencheSortEnReserve(coord) {
-
- let sortsEnCoord = TMRUtility.getSortsReserve(this.sortsReserves, coord);
- if (sortsEnCoord.length > 0) {
+ let sorts = this.getSortsReserve(coord);
+ if (sorts.length > 0) {
if (EffetsDraconiques.isSortReserveImpossible(this.actor)) {
ui.notifications.error("Une queue ou un souffle vous empèche de déclencher de sort!");
return;
@@ -784,8 +786,8 @@ export class RdDTMRDialog extends Dialog {
if (!EffetsDraconiques.isUrgenceDraconique(this.actor) &&
(EffetsDraconiques.isReserveEnSecurite(this.actor) || this.isReserveExtensible(coord))) {
let msg = "Vous êtes sur une case avec un Sort en Réserve. Grâce à votre Tête Reserve en Sécurité ou Réserve Exensible, vous pouvez contrôler le déclenchement. Cliquez si vous souhaitez le déclencher :