Astrologie: garder toutes les lectures d'un acteur
This commit is contained in:
parent
611b57c149
commit
19dd3b540c
@ -2365,26 +2365,25 @@ export class RdDActor extends RdDBaseActorSang {
|
|||||||
|
|
||||||
|
|
||||||
/* -------------------------------------------- */
|
/* -------------------------------------------- */
|
||||||
async resetNombresAstraux() {
|
async deleteNombresAstraux() {
|
||||||
const deletions = this.itemTypes['nombreastral'].map(it => it._id);
|
const deletions = this.itemTypes['nombreastral'].map(it => it._id);
|
||||||
await this.deleteEmbeddedDocuments("Item", deletions);
|
await this.deleteEmbeddedDocuments("Item", deletions);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -------------------------------------------- */
|
/* -------------------------------------------- */
|
||||||
async ajouteNombreAstral(callData) {
|
async ajouteNombreAstral(date, nbAstral, isValid) {
|
||||||
const indexDate = Number.parseInt(callData.date);
|
const indexDate = Number.parseInt(date);
|
||||||
// Ajout du nombre astral
|
// Ajout du nombre astral
|
||||||
const item = {
|
const item = {
|
||||||
name: "Nombre Astral", type: "nombreastral", system:
|
name: "Nombre Astral", type: "nombreastral", system:
|
||||||
{
|
{
|
||||||
value: callData.nbAstral,
|
value: nbAstral,
|
||||||
istrue: callData.isvalid,
|
istrue: isValid,
|
||||||
jourindex: indexDate,
|
jourindex: indexDate,
|
||||||
jourlabel: RdDTimestamp.formatIndexDate(indexDate)
|
jourlabel: RdDTimestamp.formatIndexDate(indexDate)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
await this.createEmbeddedDocuments("Item", [item]);
|
await this.createEmbeddedDocuments("Item", [item]);
|
||||||
game.system.rdd.calendrier.notifyChangeNombresAstraux();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async supprimerAnciensNombresAstraux() {
|
async supprimerAnciensNombresAstraux() {
|
||||||
|
@ -42,13 +42,6 @@ export class RdDBaseActor extends Actor {
|
|||||||
switch (sockmsg.msg) {
|
switch (sockmsg.msg) {
|
||||||
case "msg_remote_actor_call":
|
case "msg_remote_actor_call":
|
||||||
return RdDBaseActor.onRemoteActorCall(sockmsg.data, sockmsg.userId);
|
return RdDBaseActor.onRemoteActorCall(sockmsg.data, sockmsg.userId);
|
||||||
case "msg_reset_nombre_astral":
|
|
||||||
game.user.character.resetNombresAstraux();
|
|
||||||
game.system.rdd.calendrier.notifyChangeNombresAstraux();
|
|
||||||
return;
|
|
||||||
case "msg_refresh_nombre_astral":
|
|
||||||
Hooks.callAll(APP_ASTROLOGIE_REFRESH);
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5,6 +5,7 @@ import { Monnaie } from "./item-monnaie.js";
|
|||||||
import { RdDItem, TYPES } from "./item.js";
|
import { RdDItem, TYPES } from "./item.js";
|
||||||
import { RdDTimestamp } from "./time/rdd-timestamp.js";
|
import { RdDTimestamp } from "./time/rdd-timestamp.js";
|
||||||
import { RdDRaretes } from "./item/raretes.js";
|
import { RdDRaretes } from "./item/raretes.js";
|
||||||
|
import { RdDCalendrier } from "./time/rdd-calendrier.js";
|
||||||
|
|
||||||
class Migration {
|
class Migration {
|
||||||
get code() { return "sample"; }
|
get code() { return "sample"; }
|
||||||
@ -514,6 +515,20 @@ class _10_7_19_PossessionsEntiteVictime extends Migration {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class _11_2_20_MigrationAstrologie extends Migration {
|
||||||
|
get code() { return "migration-astrologie" }
|
||||||
|
get version() { return "11.2.20" }
|
||||||
|
|
||||||
|
async migrate() {
|
||||||
|
const nombresAstraux = game.system.rdd.calendrier.getNombresAstraux()
|
||||||
|
nombresAstraux.forEach(na => {
|
||||||
|
na.lectures = na.valeursFausses
|
||||||
|
na.valeursFausses = undefined
|
||||||
|
})
|
||||||
|
await game.system.rdd.calendrier.setNombresAstraux(nombresAstraux)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export class Migrations {
|
export class Migrations {
|
||||||
static getMigrations() {
|
static getMigrations() {
|
||||||
return [
|
return [
|
||||||
@ -532,6 +547,7 @@ export class Migrations {
|
|||||||
new _10_7_0_MigrationBlessures(),
|
new _10_7_0_MigrationBlessures(),
|
||||||
new _10_7_19_CategorieCompetenceCreature(),
|
new _10_7_19_CategorieCompetenceCreature(),
|
||||||
new _10_7_19_PossessionsEntiteVictime(),
|
new _10_7_19_PossessionsEntiteVictime(),
|
||||||
|
new _11_2_20_MigrationAstrologie(),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -546,7 +562,10 @@ export class Migrations {
|
|||||||
}
|
}
|
||||||
|
|
||||||
migrate() {
|
migrate() {
|
||||||
const currentVersion = game.settings.get(SYSTEM_RDD, "systemMigrationVersion");
|
let currentVersion = game.settings.get(SYSTEM_RDD, "systemMigrationVersion")
|
||||||
|
if (currentVersion.startsWith("v")) {
|
||||||
|
currentVersion = currentVersion.substring(1)
|
||||||
|
}
|
||||||
if (isNewerVersion(game.system.version, currentVersion)) {
|
if (isNewerVersion(game.system.version, currentVersion)) {
|
||||||
// if (true) { /* comment previous and uncomment here to test before upgrade */
|
// if (true) { /* comment previous and uncomment here to test before upgrade */
|
||||||
const migrations = Migrations.getMigrations().filter(m => isNewerVersion(m.version, currentVersion));
|
const migrations = Migrations.getMigrations().filter(m => isNewerVersion(m.version, currentVersion));
|
||||||
|
@ -18,6 +18,7 @@ import { RdDRaretes } from "./item/raretes.js";
|
|||||||
import { RdDEmpoignade } from "./rdd-empoignade.js";
|
import { RdDEmpoignade } from "./rdd-empoignade.js";
|
||||||
import { ExperienceLog } from "./actor/experience-log.js";
|
import { ExperienceLog } from "./actor/experience-log.js";
|
||||||
import { RdDCoeur } from "./coeur/rdd-coeur.js";
|
import { RdDCoeur } from "./coeur/rdd-coeur.js";
|
||||||
|
import { APP_ASTROLOGIE_REFRESH } from "./sommeil/app-astrologie.js";
|
||||||
|
|
||||||
/* -------------------------------------------- */
|
/* -------------------------------------------- */
|
||||||
// This table starts at 0 -> niveau -10
|
// This table starts at 0 -> niveau -10
|
||||||
@ -625,21 +626,15 @@ export class RdDUtility {
|
|||||||
return perte.total;
|
return perte.total;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -------------------------------------------- */
|
|
||||||
static async responseNombreAstral(callData) {
|
|
||||||
let actor = game.actors.get(callData.id);
|
|
||||||
actor.ajouteNombreAstral(callData);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* -------------------------------------------- */
|
/* -------------------------------------------- */
|
||||||
static onSocketMessage(sockmsg) {
|
static onSocketMessage(sockmsg) {
|
||||||
switch (sockmsg.msg) {
|
switch (sockmsg.msg) {
|
||||||
case "msg_gm_chat_message":
|
case "msg_gm_chat_message":
|
||||||
return ChatUtility.handleGMChatMessage(sockmsg.data);
|
return ChatUtility.handleGMChatMessage(sockmsg.data);
|
||||||
|
case "msg_app_astrologie_refresh":
|
||||||
|
return Hooks.callAll(APP_ASTROLOGIE_REFRESH);
|
||||||
case "msg_request_nombre_astral":
|
case "msg_request_nombre_astral":
|
||||||
return game.system.rdd.calendrier.requestNombreAstral(sockmsg.data);
|
return game.system.rdd.calendrier.requestNombreAstral(sockmsg.data);
|
||||||
case "msg_response_nombre_astral":
|
|
||||||
return RdDUtility.responseNombreAstral(sockmsg.data);
|
|
||||||
case "msg_tmr_move":
|
case "msg_tmr_move":
|
||||||
let actor = game.actors.get(sockmsg.data.actorId);
|
let actor = game.actors.get(sockmsg.data.actorId);
|
||||||
if (actor.isOwner || game.user.isGM) {
|
if (actor.isOwner || game.user.isGM) {
|
||||||
|
@ -31,7 +31,6 @@ export class AppAstrologie extends Application {
|
|||||||
constructor(actor, options = {}) {
|
constructor(actor, options = {}) {
|
||||||
super(options);
|
super(options);
|
||||||
this.actor = actor;
|
this.actor = actor;
|
||||||
this.hookReference = Hooks.on(APP_ASTROLOGIE_REFRESH, () => this.refreshAstrologie());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
getData(options) {
|
getData(options) {
|
||||||
@ -87,7 +86,8 @@ export class AppAstrologie extends Application {
|
|||||||
return {
|
return {
|
||||||
ajustementsActors: game.actors.filter(actor => actor.isPersonnageJoueur())
|
ajustementsActors: game.actors.filter(actor => actor.isPersonnageJoueur())
|
||||||
.map(actor => this.getAjustementActor(actor, nbAstral, heures)),
|
.map(actor => this.getAjustementActor(actor, nbAstral, heures)),
|
||||||
nombresAstraux: calendrier.getNombresAstraux().map(na => this.getDetailNombreAstral(na))
|
nombresAstraux: game.system.rdd.calendrier.getNombresAstraux()
|
||||||
|
.map(na => this.getDetailNombreAstral(na))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return {}
|
return {}
|
||||||
@ -107,12 +107,15 @@ export class AppAstrologie extends Application {
|
|||||||
const detail = foundry.utils.duplicate(nombreAstral);
|
const detail = foundry.utils.duplicate(nombreAstral);
|
||||||
const timestamp = new RdDTimestamp({ indexDate: nombreAstral.index });
|
const timestamp = new RdDTimestamp({ indexDate: nombreAstral.index });
|
||||||
detail.date = { mois: timestamp.mois, jour: timestamp.jour + 1 };
|
detail.date = { mois: timestamp.mois, jour: timestamp.jour + 1 };
|
||||||
detail.valeursFausses.forEach(fausse => fausse.actorName = game.actors.get(fausse.actorId).name ?? "Inconnu");
|
detail.lectures.forEach(lecture => lecture.actorName = game.actors.get(lecture.actorId).name ?? "Inconnu");
|
||||||
return detail;
|
return detail;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -------------------------------------------- */
|
/* -------------------------------------------- */
|
||||||
activateListeners(html) {
|
activateListeners(html) {
|
||||||
|
if (!this.hookReference){
|
||||||
|
this.hookReference = Hooks.on(APP_ASTROLOGIE_REFRESH, () => this.refreshAstrologie());
|
||||||
|
}
|
||||||
super.activateListeners(html);
|
super.activateListeners(html);
|
||||||
this.html = html;
|
this.html = html;
|
||||||
this.html.find('select[name="signe-astral"]').change(event => {
|
this.html.find('select[name="signe-astral"]').change(event => {
|
||||||
@ -145,8 +148,7 @@ export class AppAstrologie extends Application {
|
|||||||
|
|
||||||
/* -------------------------------------------- */
|
/* -------------------------------------------- */
|
||||||
async onRebuild() {
|
async onRebuild() {
|
||||||
game.system.rdd.calendrier.resetNombresAstraux();
|
await game.system.rdd.calendrier.resetNombresAstraux();
|
||||||
|
|
||||||
await game.system.rdd.calendrier.rebuildNombresAstraux();
|
await game.system.rdd.calendrier.rebuildNombresAstraux();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -195,6 +197,8 @@ export class AppAstrologie extends Application {
|
|||||||
}
|
}
|
||||||
|
|
||||||
refreshAstrologie() {
|
refreshAstrologie() {
|
||||||
|
this.count = (this.count ?? 0)+1
|
||||||
|
console.log(`Refreshing ${this.count}`);
|
||||||
this.render(true)
|
this.render(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -51,7 +51,6 @@ export class RdDCalendrier extends Application {
|
|||||||
this.timestamp = RdDTimestamp.getWorldTime();
|
this.timestamp = RdDTimestamp.getWorldTime();
|
||||||
if (Misc.isUniqueConnectedGM()) { // Uniquement si GM
|
if (Misc.isUniqueConnectedGM()) { // Uniquement si GM
|
||||||
RdDTimestamp.setWorldTime(this.timestamp);
|
RdDTimestamp.setWorldTime(this.timestamp);
|
||||||
this.nombresAstraux = this.getNombresAstraux();
|
|
||||||
this.rebuildNombresAstraux(); // Ensure always up-to-date
|
this.rebuildNombresAstraux(); // Ensure always up-to-date
|
||||||
}
|
}
|
||||||
Hooks.on('updateSetting', async (setting, update, options, id) => this.onUpdateSetting(setting, update, options, id));
|
Hooks.on('updateSetting', async (setting, update, options, id) => this.onUpdateSetting(setting, update, options, id));
|
||||||
@ -108,7 +107,10 @@ export class RdDCalendrier extends Application {
|
|||||||
this.timestamp = RdDTimestamp.getWorldTime();
|
this.timestamp = RdDTimestamp.getWorldTime();
|
||||||
this.positionAiguilles()
|
this.positionAiguilles()
|
||||||
this.render(false);
|
this.render(false);
|
||||||
Hooks.callAll(APP_ASTROLOGIE_REFRESH);
|
Hooks.callAll(APP_ASTROLOGIE_REFRESH)
|
||||||
|
}
|
||||||
|
if (setting.key == SYSTEM_RDD + '.' + "liste-nombre-astral") {
|
||||||
|
Hooks.callAll(APP_ASTROLOGIE_REFRESH)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -167,7 +169,11 @@ export class RdDCalendrier extends Application {
|
|||||||
|
|
||||||
/* -------------------------------------------- */
|
/* -------------------------------------------- */
|
||||||
getNombresAstraux() {
|
getNombresAstraux() {
|
||||||
return game.settings.get(SYSTEM_RDD, "liste-nombre-astral") ?? [];
|
return game.settings.get(SYSTEM_RDD, "liste-nombre-astral") ?? []
|
||||||
|
}
|
||||||
|
|
||||||
|
async setNombresAstraux(nombresAstraux) {
|
||||||
|
await game.settings.set(SYSTEM_RDD, "liste-nombre-astral", nombresAstraux)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -------------------------------------------- */
|
/* -------------------------------------------- */
|
||||||
@ -225,20 +231,15 @@ export class RdDCalendrier extends Application {
|
|||||||
const nombreAstral = await RdDDice.rollTotal("1dh", { showDice: HIDE_DICE, rollMode: "selfroll" });
|
const nombreAstral = await RdDDice.rollTotal("1dh", { showDice: HIDE_DICE, rollMode: "selfroll" });
|
||||||
return {
|
return {
|
||||||
nombreAstral: nombreAstral,
|
nombreAstral: nombreAstral,
|
||||||
valeursFausses: [],
|
lectures: [],
|
||||||
index: indexDate
|
index: indexDate
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -------------------------------------------- */
|
/* -------------------------------------------- */
|
||||||
resetNombresAstraux() {
|
async resetNombresAstraux() {
|
||||||
this.nombresAstraux = [];
|
await Promise.all(game.actors.filter(it => it.type == "personnage").map(async it => await it.deleteNombresAstraux()))
|
||||||
game.settings.set(SYSTEM_RDD, "liste-nombre-astral", []);
|
await this.setNombresAstraux([])
|
||||||
|
|
||||||
game.socket.emit(SYSTEM_SOCKET_ID, {
|
|
||||||
msg: "msg_reset_nombre_astral",
|
|
||||||
data: {}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -251,39 +252,30 @@ export class RdDCalendrier extends Application {
|
|||||||
if (indexDate == undefined) {
|
if (indexDate == undefined) {
|
||||||
indexDate = this.timestamp.indexDate;
|
indexDate = this.timestamp.indexDate;
|
||||||
}
|
}
|
||||||
this.nombresAstraux = this.getNombresAstraux();
|
const nombresAstraux = this.getNombresAstraux()
|
||||||
let astralData = this.nombresAstraux.find((nombreAstral, i) => nombreAstral.index == indexDate);
|
let astralData = nombresAstraux.find(it => it.index == indexDate);
|
||||||
return astralData?.nombreAstral ?? 0;
|
return astralData?.nombreAstral ?? 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -------------------------------------------- */
|
/* -------------------------------------------- */
|
||||||
async rebuildNombresAstraux() {
|
async rebuildNombresAstraux() {
|
||||||
if (Misc.isUniqueConnectedGM()) {
|
if (Misc.isUniqueConnectedGM()) {
|
||||||
let newList = [];
|
const nombresAstraux = this.getNombresAstraux()
|
||||||
|
let newNombresAstraux = [];
|
||||||
for (let i = 0; i < MAX_NOMBRE_ASTRAL; i++) {
|
for (let i = 0; i < MAX_NOMBRE_ASTRAL; i++) {
|
||||||
let dayIndex = this.timestamp.indexDate + i;
|
let dayIndex = this.timestamp.indexDate + i;
|
||||||
let na = this.nombresAstraux.find(n => n.index == dayIndex);
|
let na = nombresAstraux.find(it => it.index == dayIndex);
|
||||||
if (na) {
|
if (na) {
|
||||||
newList[i] = na;
|
newNombresAstraux[i] = na;
|
||||||
} else {
|
} else {
|
||||||
newList[i] = await this.ajouterNombreAstral(dayIndex);
|
newNombresAstraux[i] = await this.ajouterNombreAstral(dayIndex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.nombresAstraux = newList;
|
|
||||||
game.settings.set(SYSTEM_RDD, "liste-nombre-astral", newList);
|
|
||||||
game.actors.filter(it => it.isPersonnage()).forEach(actor => actor.supprimerAnciensNombresAstraux());
|
game.actors.filter(it => it.isPersonnage()).forEach(actor => actor.supprimerAnciensNombresAstraux());
|
||||||
this.notifyChangeNombresAstraux();
|
await this.setNombresAstraux(newNombresAstraux);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
notifyChangeNombresAstraux() {
|
|
||||||
Hooks.callAll(APP_ASTROLOGIE_REFRESH);
|
|
||||||
game.socket.emit(SYSTEM_SOCKET_ID, {
|
|
||||||
msg: "msg_refresh_nombre_astral",
|
|
||||||
data: {}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/* -------------------------------------------- */
|
/* -------------------------------------------- */
|
||||||
async setNewTimestamp(newTimestamp) {
|
async setNewTimestamp(newTimestamp) {
|
||||||
const oldTimestamp = this.timestamp;
|
const oldTimestamp = this.timestamp;
|
||||||
@ -373,25 +365,22 @@ export class RdDCalendrier extends Application {
|
|||||||
request.nbAstral = await RdDDice.rollTotal("1dhr" + request.nbAstral, {
|
request.nbAstral = await RdDDice.rollTotal("1dhr" + request.nbAstral, {
|
||||||
rollMode: "selfroll", showDice: HIDE_DICE
|
rollMode: "selfroll", showDice: HIDE_DICE
|
||||||
});
|
});
|
||||||
|
}
|
||||||
// Mise à jour des nombres astraux du joueur
|
// Mise à jour des nombres astraux du joueur
|
||||||
this.addNbAstralIncorect(request.id, request.date, request.nbAstral);
|
await this.addNbAstralJoueur(actor, request.date, request.nbAstral, request.isValid)
|
||||||
}
|
Hooks.callAll(APP_ASTROLOGIE_REFRESH)
|
||||||
|
game.socket.emit(SYSTEM_SOCKET_ID, { msg: "msg_app_astrologie_refresh", data: {} })
|
||||||
if (Misc.getActiveUser(request.userId)?.isGM) {
|
|
||||||
RdDUtility.responseNombreAstral(request);
|
|
||||||
} else {
|
|
||||||
game.socket.emit(SYSTEM_SOCKET_ID, {
|
|
||||||
msg: "msg_response_nombre_astral",
|
|
||||||
data: request
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
addNbAstralIncorect(actorId, date, nbAstral) {
|
async addNbAstralJoueur(actor, date, nbAstral, isValid) {
|
||||||
const astralData = this.nombresAstraux.find((nombreAstral, i) => nombreAstral.index == date);
|
const nombresAstraux = this.getNombresAstraux()
|
||||||
astralData.valeursFausses.push({ actorId: actorId, nombreAstral: nbAstral });
|
const astralData = nombresAstraux.find(it => it.index == date)
|
||||||
game.settings.set(SYSTEM_RDD, "liste-nombre-astral", this.nombresAstraux);
|
if (astralData) {
|
||||||
|
astralData.lectures.push({ actorId: actor.id, nombreAstral: nbAstral });
|
||||||
|
await this.setNombresAstraux(nombresAstraux);
|
||||||
|
await actor.ajouteNombreAstral(date, nbAstral, isValid);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -------------------------------------------- */
|
/* -------------------------------------------- */
|
||||||
|
@ -15,8 +15,8 @@
|
|||||||
<td class="nombre-astral" data-nombre-astral="{{nba.nombreAstral}}">
|
<td class="nombre-astral" data-nombre-astral="{{nba.nombreAstral}}">
|
||||||
<ol>
|
<ol>
|
||||||
<b>{{nba.nombreAstral}}</b>
|
<b>{{nba.nombreAstral}}</b>
|
||||||
{{#each nba.valeursFausses as |fausse|}}
|
{{#each nba.lectures as |lecture|}}
|
||||||
<li>{{fausse.actorName}} - {{fausse.nombreAstral}}</li>
|
<li>{{lecture.actorName}} - {{lecture.nombreAstral}}</li>
|
||||||
{{/each}}
|
{{/each}}
|
||||||
</ol>
|
</ol>
|
||||||
</td>
|
</td>
|
||||||
|
Loading…
Reference in New Issue
Block a user