diff --git a/module/actor.js b/module/actor.js
index 9d9426d4..a941d79b 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -33,7 +33,7 @@ import { RdDRencontre } from "./item/rencontre.js";
import { Targets } from "./targets.js";
import { DialogRepos } from "./sommeil/dialog-repos.js";
import { RdDBaseActor } from "./actor/base-actor.js";
-import { RdDTimestamp } from "./rdd-timestamp.js";
+import { RdDTimestamp } from "./time/rdd-timestamp.js";
import { RdDItemBlessure } from "./item/blessure.js";
import { AppAstrologie } from "./sommeil/app-astrologie.js";
diff --git a/module/dialog-chronologie.js b/module/dialog-chronologie.js
index 3d0cc1d1..911942c8 100644
--- a/module/dialog-chronologie.js
+++ b/module/dialog-chronologie.js
@@ -1,7 +1,7 @@
import { SYSTEM_RDD } from "./constants.js";
import { Grammar } from "./grammar.js";
import { HtmlUtility } from "./html-utility.js";
-import { RdDTimestamp } from "./rdd-timestamp.js";
+import { RdDTimestamp } from "./time/rdd-timestamp.js";
const LATEST_USED_JOURNAL_ID = "chronologie-dernier-journal";
diff --git a/module/item-sheet.js b/module/item-sheet.js
index 558fe8c7..268474cd 100644
--- a/module/item-sheet.js
+++ b/module/item-sheet.js
@@ -10,7 +10,7 @@ import { SYSTEM_RDD } from "./constants.js";
import { RdDSheetUtility } from "./rdd-sheet-utility.js";
import { SystemCompendiums } from "./settings/system-compendiums.js";
import { Misc } from "./misc.js";
-import { RdDTimestamp } from "./rdd-timestamp.js";
+import { RdDTimestamp } from "./time/rdd-timestamp.js";
/**
* Extend the basic ItemSheet for RdD specific items
diff --git a/module/item.js b/module/item.js
index bc1248a5..05e2762b 100644
--- a/module/item.js
+++ b/module/item.js
@@ -2,7 +2,7 @@ import { DialogItemVente } from "./dialog-item-vente.js";
import { Grammar } from "./grammar.js";
import { Misc } from "./misc.js";
import { RdDHerbes } from "./rdd-herbes.js";
-import { RdDTimestamp } from "./rdd-timestamp.js";
+import { RdDTimestamp } from "./time/rdd-timestamp.js";
import { RdDUtility } from "./rdd-utility.js";
import { SystemCompendiums } from "./settings/system-compendiums.js";
import { RdDRaretes } from "./item/raretes.js";
diff --git a/module/item/blessure.js b/module/item/blessure.js
index 8f8c69ca..dbf4ad87 100644
--- a/module/item/blessure.js
+++ b/module/item/blessure.js
@@ -1,6 +1,6 @@
import { RdDItem } from "../item.js";
import { Misc } from "../misc.js";
-import { RdDTimestamp } from "../rdd-timestamp.js";
+import { RdDTimestamp } from "../time/rdd-timestamp.js";
const BASE_TACHE_SOIN_BLESSURE = {
type: "tache",
diff --git a/module/item/maladie.js b/module/item/maladie.js
index d7f15c93..46d14395 100644
--- a/module/item/maladie.js
+++ b/module/item/maladie.js
@@ -1,6 +1,6 @@
import { RdDItem } from "../item.js";
import { Misc } from "../misc.js";
-import { RdDTimestamp } from "../rdd-timestamp.js";
+import { RdDTimestamp } from "../time/rdd-timestamp.js";
export class RdDItemMaladie extends RdDItem {
diff --git a/module/item/signedraconique.js b/module/item/signedraconique.js
index 31eaf436..42c34498 100644
--- a/module/item/signedraconique.js
+++ b/module/item/signedraconique.js
@@ -2,7 +2,7 @@ import { RdDItem, defaultItemImg } from "../item.js";
import { Misc } from "../misc.js";
import { RdDDice } from "../rdd-dice.js";
import { RdDRollTables } from "../rdd-rolltables.js";
-import { RdDTimestamp } from "../rdd-timestamp.js";
+import { RdDTimestamp } from "../time/rdd-timestamp.js";
import { TMRType, TMRUtility } from "../tmr-utility.js";
const tableSignesIndicatifs = [
diff --git a/module/migrations.js b/module/migrations.js
index b1d3513f..0287775d 100644
--- a/module/migrations.js
+++ b/module/migrations.js
@@ -3,7 +3,7 @@ import { LOG_HEAD, SYSTEM_RDD } from "./constants.js";
import { Grammar } from "./grammar.js";
import { Monnaie } from "./item-monnaie.js";
import { RdDItem } from "./item.js";
-import { RdDTimestamp } from "./rdd-timestamp.js";
+import { RdDTimestamp } from "./time/rdd-timestamp.js";
import { RdDRaretes } from "./item/raretes.js";
class Migration {
diff --git a/module/misc.js b/module/misc.js
index 71ee51d5..ac04d1e6 100644
--- a/module/misc.js
+++ b/module/misc.js
@@ -239,4 +239,15 @@ export class Misc {
}
return subset;
}
+
+ static cssRotation(angle) {
+ const rotation = `rotate(${angle}deg)`;
+ return {
+ 'transform': rotation,
+ '-ms-transform': rotation,
+ '-moz-transform': rotation,
+ '-webkit-transform': rotation,
+ '-o-transform': rotation
+ };
+ }
}
diff --git a/module/rdd-herbes.js b/module/rdd-herbes.js
index 859cccea..edcd3513 100644
--- a/module/rdd-herbes.js
+++ b/module/rdd-herbes.js
@@ -1,6 +1,6 @@
import { Grammar } from "./grammar.js";
import { SystemCompendiums } from "./settings/system-compendiums.js";
-import { RdDTimestamp } from "./rdd-timestamp.js";
+import { RdDTimestamp } from "./time/rdd-timestamp.js";
/* -------------------------------------------- */
export class RdDHerbes extends Item {
diff --git a/module/rdd-main.js b/module/rdd-main.js
index 73cf5d55..d8dde122 100644
--- a/module/rdd-main.js
+++ b/module/rdd-main.js
@@ -4,8 +4,8 @@ import { Migrations } from './migrations.js';
import { RdDUtility } from "./rdd-utility.js";
import { TMRUtility } from "./tmr-utility.js";
import { TMRRencontres } from "./tmr-rencontres.js";
-import { RdDCalendrier } from "./rdd-calendrier.js";
-import { RdDTimestamp } from "./rdd-timestamp.js";
+import { RdDCalendrier } from "./time/rdd-calendrier.js";
+import { RdDTimestamp } from "./time/rdd-timestamp.js";
import { DialogChronologie } from "./dialog-chronologie.js";
import { RdDResolutionTable } from "./rdd-resolution-table.js";
@@ -181,6 +181,7 @@ export class SystemReveDeDragon {
// préparation des différents modules
RdDTimestamp.init();
+ RdDCalendrier.init();
SystemCompendiums.init();
DialogChronologie.init();
ReglesOptionelles.init();
@@ -216,25 +217,6 @@ export class SystemReveDeDragon {
default: "avant-encaissement"
});
- /* -------------------------------------------- */
- game.settings.register(SYSTEM_RDD, "liste-nombre-astral", {
- name: "liste-nombre-astral",
- scope: "world",
- config: false,
- default: [],
- type: Object
- });
-
- /* -------------------------------------------- */
- game.settings.register(SYSTEM_RDD, "calendrier-pos", {
- name: "calendrierPos",
- scope: "client",
- config: false,
- default: RdDCalendrier.createCalendrierPos(),
- type: Object
- });
-
-
/* -------------------------------------------- */
game.settings.register(SYSTEM_RDD, "supprimer-dialogues-combat-chat", {
name: "Supprimer les dialogues de combat",
@@ -280,9 +262,11 @@ export class SystemReveDeDragon {
let sidebar = document.getElementById("sidebar");
sidebar.style.width = "min-content";
}
+ game.system.rdd.calendrier = new RdDCalendrier();
if (Misc.isUniqueConnectedGM()) {
- game.system.rdd.calendrier = new RdDCalendrier();
new Migrations().migrate();
+ this.messageDeBienvenue();
+ this.registerUsageCount(SYSTEM_RDD);
}
StatusEffects.onReady();
@@ -290,8 +274,7 @@ export class SystemReveDeDragon {
RdDDice.onReady();
/* -------------------------------------------- */
/* Affiche/Init le calendrier */
- game.system.rdd.calendrier = new RdDCalendrier().display();
-
+ game.system.rdd.calendrier.display();
// Avertissement si joueur sans personnage
if (!game.user.isGM && game.user.character == undefined) {
ui.notifications.info("Attention ! Vous n'êtes connecté à aucun personnage !");
@@ -300,10 +283,6 @@ export class SystemReveDeDragon {
user: game.user.id
});
}
- if (Misc.isUniqueConnectedGM()) {
- this.messageDeBienvenue();
- this.registerUsageCount(SYSTEM_RDD);
- }
}
/* -------------------------------------------- */
diff --git a/module/rdd-tmr-dialog.js b/module/rdd-tmr-dialog.js
index 88474bc6..62e59e97 100644
--- a/module/rdd-tmr-dialog.js
+++ b/module/rdd-tmr-dialog.js
@@ -16,8 +16,7 @@ import { ReglesOptionelles } from "./settings/regles-optionelles.js";
import { RdDDice } from "./rdd-dice.js";
import { STATUSES } from "./settings/status-effects.js";
import { RdDRencontre } from "./item/rencontre.js";
-import { RdDCalendrier } from "./rdd-calendrier.js";
-import { RdDTimestamp } from "./rdd-timestamp.js";
+import { RdDTimestamp } from "./time/rdd-timestamp.js";
/* -------------------------------------------- */
diff --git a/module/rdd-utility.js b/module/rdd-utility.js
index 5260bc2a..6b2bc787 100644
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -13,7 +13,7 @@ import { RdDNameGen } from "./rdd-namegen.js";
import { RdDConfirm } from "./rdd-confirm.js";
import { RdDItemCompetence } from "./item-competence.js";
import { RdDResolutionTable } from "./rdd-resolution-table.js";
-import { RdDTimestamp } from "./rdd-timestamp.js";
+import { RdDTimestamp } from "./time/rdd-timestamp.js";
import { RdDRaretes } from "./item/raretes.js";
/* -------------------------------------------- */
@@ -196,6 +196,7 @@ export class RdDUtility {
'systems/foundryvtt-reve-de-dragon/templates/enum-tmr-effet.html',
// Partials
'systems/foundryvtt-reve-de-dragon/templates/tirage/liste-resultats-recherche.hbs',
+ 'systems/foundryvtt-reve-de-dragon/templates/time/horloge.hbs',
'systems/foundryvtt-reve-de-dragon/templates/common/timestamp.hbs',
'systems/foundryvtt-reve-de-dragon/templates/common/periodicite.hbs',
'systems/foundryvtt-reve-de-dragon/templates/common/enum-duree.hbs',
@@ -231,9 +232,6 @@ export class RdDUtility {
'systems/foundryvtt-reve-de-dragon/templates/sommeil/astrologie-gardien.hbs',
'systems/foundryvtt-reve-de-dragon/templates/sommeil/astrologie-joueur.hbs',
'systems/foundryvtt-reve-de-dragon/templates/sommeil/astrologie-theme.hbs',
- // Calendrier
- 'systems/foundryvtt-reve-de-dragon/templates/calendar-template.html',
- 'systems/foundryvtt-reve-de-dragon/templates/calendar-editor-template.html',
// HUD
'systems/foundryvtt-reve-de-dragon/templates/hud-actor-init.html',
'systems/foundryvtt-reve-de-dragon/templates/hud-actor-attaque.html',
diff --git a/module/sommeil/app-astrologie.js b/module/sommeil/app-astrologie.js
index 53deec80..72d59e1d 100644
--- a/module/sommeil/app-astrologie.js
+++ b/module/sommeil/app-astrologie.js
@@ -1,6 +1,6 @@
import { SYSTEM_RDD } from "../constants.js";
import { Misc } from "../misc.js";
-import { RDD_MINUTES_PAR_HEURES, RDD_MINUTES_PAR_JOUR, RdDTimestamp } from "../rdd-timestamp.js";
+import { RdDTimestamp } from "../time/rdd-timestamp.js";
export const APP_ASTROLOGIE_REFRESH = `${SYSTEM_RDD}-refresh-astrologie`
@@ -22,6 +22,7 @@ export class AppAstrologie extends Application {
title: "Astrologie",
width: 'fit-content',
height: 'fit-content',
+ classes: ['calendar-astrologie'],
popOut: true,
resizable: false
});
@@ -155,30 +156,19 @@ export class AppAstrologie extends Application {
RdDTimestamp.definitions().forEach(dh => {
const ajustement = RdDTimestamp.ajustementAstrologiqueHeure(heureNaissance, chiffreAstral, dh.heure + 1);
const txtAjustement = ajustement == 0 ? '' : Misc.toSignedString(ajustement);
- this.html.find(`div.astro-ajustement.heure-${dh.hh}`).text(txtAjustement)
+ this.html.find(`div.horloge-ajustement.heure-${dh.hh}`).text(txtAjustement)
});
this.html.find(`select[name="signe-astral"]`).val(this.appData.theme.signeAstral.key)
this.html.find(`select[name="signe-naissance"]`).val(this.appData.theme.signeNaissance.key)
const angleAstrologie = ((chiffreAstral + heureNaissance) * 30) % 360 - 45;
- this.html.find(`div.astro-roue div.astro-disque img`).css(this.cssRotation(angleAstrologie));
-
+ this.html.find(`div.horloge-roue div.disque-astro img`).css(Misc.cssRotation(angleAstrologie));
+
const timestamp = game.system.rdd.calendrier.getTimestamp();
- this.html.find(`div.astro-roue div.astro-horloge-heure img`).css(this.cssRotation(timestamp.angleHeure));
- this.html.find(`div.astro-roue div.astro-horloge-minute img`).css(this.cssRotation(timestamp.angleMinute));
- }
-
- cssRotation(angleAstrologie) {
- const rotation = `rotate(${angleAstrologie}deg)`;
- return {
- 'transform': rotation,
- '-ms-transform': rotation,
- '-moz-transform': rotation,
- '-webkit-transform': rotation,
- '-o-transform': rotation
- };
+ this.html.find(`div.horloge-roue div.horloge-aiguille-heure img`).css(Misc.cssRotation(timestamp.angleHeure));
+ this.html.find(`div.horloge-roue div.horloge-aiguille-minute img`).css(Misc.cssRotation(timestamp.angleMinute));
}
requestJetAstrologie() {
diff --git a/module/rdd-calendrier-editeur.js b/module/time/rdd-calendrier-editor.js
similarity index 87%
rename from module/rdd-calendrier-editeur.js
rename to module/time/rdd-calendrier-editor.js
index d6347ffa..3ec10947 100644
--- a/module/rdd-calendrier-editeur.js
+++ b/module/time/rdd-calendrier-editor.js
@@ -4,7 +4,7 @@ import { RdDTimestamp } from "./rdd-timestamp.js";
* Extend the base Dialog entity by defining a custom window to perform roll.
* @extends {Dialog}
*/
-export class RdDCalendrierEditeur extends Dialog {
+export class RdDCalendrierEditor extends Dialog {
/* -------------------------------------------- */
constructor(html, calendrier, calendrierData) {
@@ -30,8 +30,8 @@ export class RdDCalendrierEditeur extends Dialog {
this.html.find("input[name='calendar.annee']").val(this.calendrierData.annee);
this.html.find("select[name='calendar.mois']").val(this.calendrierData.mois.key);
this.html.find("select[name='calendar.heure']").val(this.calendrierData.heure.key);
- RdDCalendrierEditeur.setLimited(this.html.find("input[name='calendar.jourDuMois']"), this.calendrierData.jourDuMois, 1, 28);
- RdDCalendrierEditeur.setLimited(this.html.find("input[name='calendar.minute']"), this.calendrierData.minute, 0, 119);
+ RdDCalendrierEditor.setLimited(this.html.find("input[name='calendar.jourDuMois']"), this.calendrierData.jourDuMois, 1, 28);
+ RdDCalendrierEditor.setLimited(this.html.find("input[name='calendar.minute']"), this.calendrierData.minute, 0, 119);
}
static setLimited(input, init, min, max) {
diff --git a/module/rdd-calendrier.js b/module/time/rdd-calendrier.js
similarity index 63%
rename from module/rdd-calendrier.js
rename to module/time/rdd-calendrier.js
index 03fb26a5..62769c7a 100644
--- a/module/rdd-calendrier.js
+++ b/module/time/rdd-calendrier.js
@@ -1,58 +1,115 @@
-import { RdDCalendrierEditeur } from "./rdd-calendrier-editeur.js";
-import { RdDResolutionTable } from "./rdd-resolution-table.js";
-import { RdDUtility } from "./rdd-utility.js";
-import { RdDDice } from "./rdd-dice.js";
-import { Misc } from "./misc.js";
-import { HIDE_DICE, SHOW_DICE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
-import { DialogChronologie } from "./dialog-chronologie.js";
import { MAX_NOMBRE_ASTRAL, RdDTimestamp, WORLD_TIMESTAMP_SETTING } from "./rdd-timestamp.js";
-import { DialogChateauDormant } from "./sommeil/dialog-chateau-dormant.js";
-import { ReglesOptionelles } from "./settings/regles-optionelles.js";
-import { APP_ASTROLOGIE_REFRESH, AppAstrologie } from "./sommeil/app-astrologie.js";
+import { RdDCalendrierEditor } from "./rdd-calendrier-editor.js";
+import { RdDResolutionTable } from "../rdd-resolution-table.js";
+import { RdDUtility } from "../rdd-utility.js";
+import { RdDDice } from "../rdd-dice.js";
+import { Misc } from "../misc.js";
+import { DialogChronologie } from "../dialog-chronologie.js";
+import { HIDE_DICE, SHOW_DICE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "../constants.js";
+import { ReglesOptionelles } from "../settings/regles-optionelles.js";
+import { DialogChateauDormant } from "../sommeil/dialog-chateau-dormant.js";
+import { APP_ASTROLOGIE_REFRESH, AppAstrologie } from "../sommeil/app-astrologie.js";
+const TEMPLATE_CALENDRIER = "systems/foundryvtt-reve-de-dragon/templates/time/calendar.hbs";
+
+const INITIAL_CALENDAR_POS = { top: 200, left: 200, horlogeAnalogique: true };
/* -------------------------------------------- */
export class RdDCalendrier extends Application {
+ static init() {
+ game.settings.register(SYSTEM_RDD, "liste-nombre-astral", {
+ name: "liste-nombre-astral",
+ scope: "world",
+ config: false,
+ default: [],
+ type: Object
+ });
- static get defaultOptions() {
- return mergeObject(super.defaultOptions, {
- template: "systems/foundryvtt-reve-de-dragon/templates/calendar-template.html",
- popOut: false,
- resizable: false
+ game.settings.register(SYSTEM_RDD, "calendrier-pos", {
+ name: "calendrierPos",
+ scope: "client",
+ config: false,
+ default: INITIAL_CALENDAR_POS,
+ type: Object
});
}
- static createCalendrierPos() {
- return { top: 200, left: 200 };
+ static get defaultOptions() {
+ return mergeObject(super.defaultOptions, {
+ title: "Calendrier",
+ template: TEMPLATE_CALENDRIER,
+ classes: ["calendar"],
+ popOut: true,
+ resizable: false,
+ width: 'fit-content',
+ height: 'fit-content',
+ });
}
constructor() {
super();
- // position
- this.calendrierPos = duplicate(game.settings.get(SYSTEM_RDD, "calendrier-pos"));
- if (this.calendrierPos == undefined || this.calendrierPos.top == undefined) {
- this.calendrierPos = RdDCalendrier.createCalendrierPos();
- game.settings.set(SYSTEM_RDD, "calendrier-pos", this.calendrierPos);
- }
- // Calendrier
this.timestamp = RdDTimestamp.getWorldTime();
-
if (Misc.isUniqueConnectedGM()) { // Uniquement si GM
RdDTimestamp.setWorldTime(this.timestamp);
this.nombresAstraux = this.getNombresAstraux();
this.rebuildNombresAstraux(HIDE_DICE); // Ensure always up-to-date
}
- console.log('RdDCalendrier.constructor()', this.timestamp, this.timestamp.toCalendrier(), this.calendrierPos, this.nombresAstraux);
Hooks.on('updateSetting', async (setting, update, options, id) => this.onUpdateSetting(setting, update, options, id));
}
- display() {
- let templatePath = "systems/foundryvtt-reve-de-dragon/templates/calendar-template.html";
- renderTemplate(templatePath, {}).then(html => {
- this.render(true);
+ get title() {
+ const calendrier = this.timestamp.toCalendrier();
+ return `${calendrier.heure.label}, ${calendrier.jourDuMois} ${calendrier.mois.label} ${calendrier.annee} (${calendrier.mois.saison})`;
+ }
+
+ savePosition() {
+ game.settings.set(SYSTEM_RDD, "calendrier-pos", {
+ top: this.position.top,
+ left: this.position.left,
+ horlogeAnalogique: this.horlogeAnalogique
});
+ }
+
+ getSavePosition() {
+ const pos = game.settings.get(SYSTEM_RDD, "calendrier-pos");
+ if (pos?.top == undefined) {
+ return INITIAL_CALENDAR_POS;
+ }
+ this.horlogeAnalogique = pos.horlogeAnalogique;
+ return pos
+ }
+
+ setPosition(position) {
+ super.setPosition(position)
+ this.savePosition()
+ }
+
+ display() {
+ const pos = this.getSavePosition()
+ this.render(true, { left: pos.left, top: pos.top});
return this;
}
+ _getHeaderButtons() {
+ const buttons = [];
+ if (game.user.isGM) {
+ buttons.unshift({
+ class: "calendar-astrologie",
+ icon: "fa-solid fa-moon-over-sun",
+ onclick: ev => this.showAstrologieEditor()
+ },
+ {
+ class: "calendar-set-datetime",
+ icon: "fa-solid fa-calendar-pen",
+ onclick: ev => this.showCalendarEditor()
+ });
+ }
+ return buttons
+ }
+ async maximize() {
+ await super.maximize()
+ this.render(true)
+ }
+
async onUpdateSetting(setting, update, options, id) {
if (setting.key == SYSTEM_RDD + '.' + WORLD_TIMESTAMP_SETTING) {
this.timestamp = RdDTimestamp.getWorldTime();
@@ -61,18 +118,35 @@ export class RdDCalendrier extends Application {
}
}
+ getData() {
+ const formData = super.getData();
+ this.fillCalendrierData(formData);
+ return formData;
+ }
+
+ /* -------------------------------------------- */
+ fillCalendrierData(formData = {}) {
+ mergeObject(formData, this.timestamp.toCalendrier());
+ formData.isGM = game.user.isGM;
+ formData.heures = RdDTimestamp.definitions()
+ formData.horlogeAnalogique = this.horlogeAnalogique;
+ return formData;
+ }
+
/* -------------------------------------------- */
/** @override */
async activateListeners(html) {
super.activateListeners(html);
this.html = html;
-
this.updateDisplay();
this.html.find('.ajout-chronologie').click(ev => DialogChronologie.create());
-
+ this.html.find('.toggle-horloge-analogique').click(ev => this.onToggleHorlogeAnalogique())
this.html.find('.calendar-btn').click(ev => this.onCalendarButton(ev));
-
+ this.html.find('.horloge-roue .horloge-heure').click(event => {
+ const h = this.html.find(event.currentTarget)?.data('heure');
+ this.positionnerHeure(Number(h));
+ })
this.html.find('.calendar-set-datetime').click(ev => {
ev.preventDefault();
this.showCalendarEditor();
@@ -82,77 +156,14 @@ export class RdDCalendrier extends Application {
ev.preventDefault();
this.showAstrologieEditor();
});
-
- this.html.find('.calendar-title').mousedown(ev => {
- ev.preventDefault();
- ev = ev || window.event;
- let isRightMB = false;
- if ("which" in ev) { // Gecko (Firefox), WebKit (Safari/Chrome) & Opera
- isRightMB = ev.which == 3;
- } else if ("button" in ev) { // IE, Opera
- isRightMB = ev.button == 2;
- }
-
- if (!isRightMB) {
- dragElement(document.getElementById("calendar-time-container"));
- let pos1 = 0, pos2 = 0, pos3 = 0, pos4 = 0;
-
- function dragElement(elmnt) {
- elmnt.onmousedown = dragMouseDown;
- function dragMouseDown(e) {
- e = e || window.event;
- e.preventDefault();
- pos3 = e.clientX;
- pos4 = e.clientY;
-
- document.onmouseup = closeDragElement;
- document.onmousemove = elementDrag;
- }
-
- function elementDrag(e) {
- e = e || window.event;
- e.preventDefault();
- // calculate the new cursor position:
- pos1 = pos3 - e.clientX;
- pos2 = pos4 - e.clientY;
- pos3 = e.clientX;
- pos4 = e.clientY;
- // set the element's new position:
- elmnt.style.bottom = undefined
- elmnt.style.top = (elmnt.offsetTop - pos2) + "px";
- elmnt.style.left = (elmnt.offsetLeft - pos1) + "px";
- }
-
- function closeDragElement() {
- // stop moving when mouse button is released:
- elmnt.onmousedown = undefined;
- document.onmouseup = undefined;
- document.onmousemove = undefined;
- let xPos = (elmnt.offsetLeft - pos1) > window.innerWidth ? window.innerWidth - 200 : (elmnt.offsetLeft - pos1);
- let yPos = (elmnt.offsetTop - pos2) > window.innerHeight - 20 ? window.innerHeight - 100 : (elmnt.offsetTop - pos2)
- xPos = xPos < 0 ? 0 : xPos;
- yPos = yPos < 0 ? 0 : yPos;
- if (xPos != (elmnt.offsetLeft - pos1) || yPos != (elmnt.offsetTop - pos2)) {
- elmnt.style.top = (yPos) + "px";
- elmnt.style.left = (xPos) + "px";
- }
- game.system.rdd.calendrier.calendrierPos.top = yPos;
- game.system.rdd.calendrier.calendrierPos.left = xPos;
- if (game.user.isGM) {
- game.settings.set(SYSTEM_RDD, "calendrier-pos", duplicate(game.system.rdd.calendrier.calendrierPos));
- }
- }
- }
- } else if (isRightMB) {
- game.system.rdd.calendrier.calendrierPos.top = 200;
- game.system.rdd.calendrier.calendrierPos.left = 200;
- if (game.user.isGM) {
- game.settings.set(SYSTEM_RDD, "calendrier-pos", duplicate(game.system.rdd.calendrier.calendrierPos));
- }
- this.setPos(game.system.rdd.calendrier.calendrierPos);
- }
- });
}
+
+ onToggleHorlogeAnalogique() {
+ this.horlogeAnalogique = !this.horlogeAnalogique;
+ this.savePosition()
+ this.render(true)
+ }
+
/* -------------------------------------------- */
getNombresAstraux() {
return game.settings.get(SYSTEM_RDD, "liste-nombre-astral") ?? [];
@@ -226,7 +237,6 @@ export class RdDCalendrier extends Application {
});
}
- /* -------------------------------------------- */
/**
*
* @param {*} indexDate la date pour laquelle obtenir le nombre astral. Si undefined, on prend la date du jour
@@ -281,6 +291,7 @@ export class RdDCalendrier extends Application {
this.timestamp = newTimestamp;
await this.rebuildNombresAstraux();
this.updateDisplay();
+ this.display();
}
/* -------------------------------------------- */
@@ -295,34 +306,32 @@ export class RdDCalendrier extends Application {
this.positionnerHeure(Number(calendarSet.value));
}
this.updateDisplay();
- Hooks.callAll(APP_ASTROLOGIE_REFRESH);
}
-
+
/* -------------------------------------------- */
async incrementTime(minutes = 0) {
- await this.setNewTimestamp(this.timestamp.addMinutes(minutes));
+ if (game.user.isGM) {
+ await this.setNewTimestamp(this.timestamp.addMinutes(minutes));
+ Hooks.callAll(APP_ASTROLOGIE_REFRESH);
+ }
}
-
+
/* -------------------------------------------- */
async incrementerJour() {
await this.setNewTimestamp(this.timestamp.nouveauJour());
}
-
+
/* -------------------------------------------- */
async positionnerHeure(heure) {
- const indexDate = this.timestamp.indexDate;
- const addDay = this.timestamp.heure < heure ? 0 : 1;
- const newTimestamp = new RdDTimestamp({ indexDate: indexDate + addDay }).addHeures(heure);
- await this.setNewTimestamp(newTimestamp)
+ if (game.user.isGM) {
+ const indexDate = this.timestamp.indexDate;
+ const addDay = this.timestamp.heure < heure ? 0 : 1;
+ const newTimestamp = new RdDTimestamp({ indexDate: indexDate + addDay }).addHeures(heure);
+ await this.setNewTimestamp(newTimestamp)
+ Hooks.callAll(APP_ASTROLOGIE_REFRESH);
+ }
}
-
- /* -------------------------------------------- */
- fillCalendrierData(formData = {}) {
- mergeObject(formData, this.timestamp.toCalendrier());
- formData.isGM = game.user.isGM;
- return formData;
- }
-
+
/* -------------------------------------------- */
getLectureAstrologieDifficulte(dateIndex) {
let indexNow = this.timestamp.indexDate;
@@ -376,14 +385,14 @@ export class RdDCalendrier extends Application {
}
addNbAstralIncorect(actorId, date, nbAstral) {
- let astralData = this.nombresAstraux.find((nombreAstral, i) => nombreAstral.index == date);
+ const astralData = this.nombresAstraux.find((nombreAstral, i) => nombreAstral.index == date);
astralData.valeursFausses.push({ actorId: actorId, nombreAstral: nbAstral });
game.settings.set(SYSTEM_RDD, "liste-nombre-astral", this.nombresAstraux);
}
/* -------------------------------------------- */
getAjustementAstrologique(heureNaissance, name = undefined) {
- let defHeure = RdDTimestamp.findHeure(heureNaissance);
+ const defHeure = RdDTimestamp.findHeure(heureNaissance);
if (defHeure) {
return RdDTimestamp.ajustementAstrologiqueHeure(defHeure.heure, this.getNombreAstral(), this.timestamp.heure);
}
@@ -396,54 +405,22 @@ export class RdDCalendrier extends Application {
return 0;
}
- /* -------------------------------------------- */
- getData() {
- let formData = super.getData();
- this.fillCalendrierData(formData);
- this.setPos(this.calendrierPos);
- return formData;
- }
-
- /* -------------------------------------------- */
- setPos(pos) {
- return new Promise(resolve => {
- function check() {
- let elmnt = document.getElementById("calendar-time-container");
- if (elmnt) {
- elmnt.style.bottom = undefined;
- let xPos = (pos.left) > window.innerWidth ? window.innerWidth - 200 : pos.left;
- let yPos = (pos.top) > window.innerHeight - 20 ? window.innerHeight - 100 : pos.top;
- elmnt.style.top = (yPos) + "px";
- elmnt.style.left = (xPos) + "px";
- resolve();
- } else {
- setTimeout(check, 30);
- }
- }
- check();
- });
- }
-
/* -------------------------------------------- */
updateDisplay() {
- let calendrier = this.fillCalendrierData();
- // Rebuild text du calendrier
- let dateHTML = `${calendrier.jourDuMois} ${calendrier.mois.label} (${calendrier.mois.saison}) de l'année ${calendrier.annee}`
- if (game.user.isGM) {
- dateHTML = dateHTML + "
-
-
{{jourDuMois}} {{mois.label}} ({{mois.saison}})
-
- {{#if isGM}}
-
-
-
- {{#if isGM}}
- +1
- +5
- +15
- +30
- +60
- +1h
- {{else}}
- {{/if}}
-
-
-
-
-
- {{#if isGM}}
-
-
-
-
- {{/if}}
-
-
-
-
Heures de chance et malchance
-
-
- {{#each heures as |heure|}}
-
-
- {{/each}}
-
-
-
-
-
-
-
-
-
-
-
+ {{#if isGM}}
+
+
+1
+
+5
+
+15
+
+30
+
+60
+
+1h
+
+
+
+
+
+ {{/if}}
+
+
+{{#if horlogeAnalogique}}
+ {{> 'systems/foundryvtt-reve-de-dragon/templates/time/horloge.hbs' }}
+{{/if}}
+
\ No newline at end of file
diff --git a/templates/time/horloge.hbs b/templates/time/horloge.hbs
new file mode 100644
index 00000000..8fcb27f2
--- /dev/null
+++ b/templates/time/horloge.hbs
@@ -0,0 +1,22 @@
+
+
+
+ {{#if theme}}
+ {{#each heures as |heure|}}
+
+ {{/each}}
+
+
+
+ {{/if}}
+ {{#each heures as |heure|}}
+
+ {{/each}}
+
+
+
+
+
+
+
+
- {{heure.label}}
-
- {{#if isGM}}
- 
-
-
- 
-
- {{/if}}
- 
- 
- 
-