Sync merge manuel

This commit is contained in:
LeRatierBretonnien 2023-03-09 23:49:37 +01:00
parent ac1da6e979
commit 3bf5beb67b
8 changed files with 194 additions and 199 deletions

View File

@ -10,8 +10,8 @@ const RDD_MOIS_PAR_AN = 12;
export const RDD_JOURS_PAR_MOIS = 28; export const RDD_JOURS_PAR_MOIS = 28;
export const RDD_HEURES_PAR_JOUR = 12; export const RDD_HEURES_PAR_JOUR = 12;
export const MAX_NOMBRE_ASTRAL = 12; export const MAX_NOMBRE_ASTRAL = 12;
const RDD_MINUTES_PAR_HEURES = 120; export const RDD_MINUTES_PAR_HEURES = 120;
const RDD_MINUTES_PAR_JOUR = 1440; //RDD_HEURES_PAR_JOUR * RDD_MINUTES_PAR_HEURES; export const RDD_MINUTES_PAR_JOUR = 1440; //RDD_HEURES_PAR_JOUR * RDD_MINUTES_PAR_HEURES;
const ROUNDS_PAR_MINUTE = 10; const ROUNDS_PAR_MINUTE = 10;
const DEFINITION_HEURES = [ const DEFINITION_HEURES = [
@ -252,7 +252,8 @@ export class RdDTimestamp {
get heure() { return Math.floor(this.indexMinute / RDD_MINUTES_PAR_HEURES) } get heure() { return Math.floor(this.indexMinute / RDD_MINUTES_PAR_HEURES) }
get minute() { return this.indexMinute % RDD_MINUTES_PAR_HEURES } get minute() { return this.indexMinute % RDD_MINUTES_PAR_HEURES }
get round() { return ROUNDS_PAR_MINUTE * (this.indexMinute - Math.floor(this.indexMinute)) } get round() { return ROUNDS_PAR_MINUTE * (this.indexMinute - Math.floor(this.indexMinute)) }
get pourcentageDuJour() { return this.indexMinute / RDD_MINUTES_PAR_JOUR } get angleHeure() { return this.indexMinute / RDD_MINUTES_PAR_JOUR * 360 - 60 }
get angleMinute() { return this.indexMinute / RDD_MINUTES_PAR_HEURES * 360 + 45}
formatDate() { formatDate() {
const jour = this.jour + 1; const jour = this.jour + 1;

View File

@ -1,6 +1,6 @@
import { SYSTEM_RDD } from "../constants.js"; import { SYSTEM_RDD } from "../constants.js";
import { Misc } from "../misc.js"; import { Misc } from "../misc.js";
import { RdDTimestamp } from "../rdd-timestamp.js"; import { RDD_MINUTES_PAR_HEURES, RDD_MINUTES_PAR_JOUR, RdDTimestamp } from "../rdd-timestamp.js";
export const APP_ASTROLOGIE_REFRESH = `${SYSTEM_RDD}-refresh-astrologie` export const APP_ASTROLOGIE_REFRESH = `${SYSTEM_RDD}-refresh-astrologie`
@ -128,7 +128,7 @@ export class AppAstrologie extends Application {
}) })
this.html.find('[name="jet-astrologie"]').click(event => this.requestJetAstrologie()); this.html.find('[name="jet-astrologie"]').click(event => this.requestJetAstrologie());
this.html.find('[name="rebuild-nombres-astraux"]').click(event => this.rebuildNombresAstraux()); this.html.find('[name="rebuild-nombres-astraux"]').click(event => this.rebuildNombresAstraux());
this.onCalculThemeAstral(); this.onCalculThemeAstral();
} }
@ -155,30 +155,30 @@ export class AppAstrologie extends Application {
RdDTimestamp.definitions().forEach(dh => { RdDTimestamp.definitions().forEach(dh => {
const ajustement = RdDTimestamp.ajustementAstrologiqueHeure(heureNaissance, chiffreAstral, dh.heure + 1); const ajustement = RdDTimestamp.ajustementAstrologiqueHeure(heureNaissance, chiffreAstral, dh.heure + 1);
const txtAjustement = ajustement == 0 ? '' : Misc.toSignedString(ajustement); const txtAjustement = ajustement == 0 ? '' : Misc.toSignedString(ajustement);
this.html.find(`div.astro-ajustement.ajustement-${dh.hh}`).text(txtAjustement) this.html.find(`div.astro-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-astral"]`).val(this.appData.theme.signeAstral.key)
this.html.find(`select[name="signe-naissance"]`).val(this.appData.theme.signeNaissance.key) this.html.find(`select[name="signe-naissance"]`).val(this.appData.theme.signeNaissance.key)
const angleAstrologie = ((chiffreAstral + heureNaissance) * 30) % 360; 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.astro-roue div.astro-disque img`).css(this.cssRotation(angleAstrologie));
const timestamp = game.system.rdd.calendrier.getTimestamp(); const timestamp = game.system.rdd.calendrier.getTimestamp();
const angleHeure = timestamp.pourcentageDuJour * 360
this.html.find(`div.astro-roue div.astro-horloge img`).css(this.cssRotation(angleHeure)); 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) { cssRotation(angleAstrologie) {
const rotation = `rotate(${angleAstrologie}deg)`; const rotation = `rotate(${angleAstrologie}deg)`;
const cssRotation = { return {
'transform': rotation, 'transform': rotation,
'-ms-transform': rotation, '-ms-transform': rotation,
'-moz-transform': rotation, '-moz-transform': rotation,
'-webkit-transform': rotation, '-webkit-transform': rotation,
'-o-transform': rotation '-o-transform': rotation
}; };
return cssRotation;
} }
requestJetAstrologie() { requestJetAstrologie() {

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="675" height="675" version="1.1" viewBox="0 0 178.59 178.59" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<metadata>
<rdf:RDF>
<cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:title/>
</cc:Work>
</rdf:RDF>
</metadata>
<circle cx="89.297" cy="89.297" r="4.6257" style="fill:#214478"/>
<g transform="matrix(.98563 -.98178 .98563 .98178 -87.392 88.66)">
<rect x="88.635" y="7.9375" width="1.3229" height="82.021" style="fill:#214478"/>
<path d="m88.635 72.76s-2.6458-1e-6 -2.6458-2.6458c-1e-6 -5.2917 1.2526-5.291 1.2149-13.168-0.01237-2.5872 1.4309-4.0295 1.4309-15.936 2e-6 -9.7014 0-29.104 0-29.104s-0.96823-1.3508-1.3297-2.5446c-0.65159-2.152 0.35906-1.9377 1.0888-4.0645 0.32001-0.93267 0.86732-5.2972 0.86732-5.2972s0.59836 4.3708 0.91836 5.3035c0.72973 2.1268 1.6581 1.9061 1.0065 4.0582-0.36144 1.1937-1.2284 2.5446-1.2284 2.5446v29.104c0 11.906 1.3229 13.229 1.2284 15.936-0.27485 7.8725 1.4174 7.8768 1.4174 13.168 1e-6 2.6458-2.6458 2.6458-2.6458 2.6458z" style="fill:#214478"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -78,15 +78,15 @@
--gradient-purple-black: linear-gradient(150deg, rgba(0, 0, 0, 0.7), rgba(100, 45, 124, 0.4), rgba(82, 17, 131, 0.3),rgba(100, 45, 124, 0.4), rgba(0, 0, 0, 0.7)); --gradient-purple-black: linear-gradient(150deg, rgba(0, 0, 0, 0.7), rgba(100, 45, 124, 0.4), rgba(82, 17, 131, 0.3),rgba(100, 45, 124, 0.4), rgba(0, 0, 0, 0.7));
--gradient-silver-light: linear-gradient(30deg, rgba(61, 55, 93, 0.2), rgba(178, 179, 196, 0.1), rgba(59, 62, 63, 0.2), rgba(206, 204, 199, 0.1), rgba(61, 46, 49, 0.2)); --gradient-silver-light: linear-gradient(30deg, rgba(61, 55, 93, 0.2), rgba(178, 179, 196, 0.1), rgba(59, 62, 63, 0.2), rgba(206, 204, 199, 0.1), rgba(61, 46, 49, 0.2));
--gradient-daylight: conic-gradient( --gradient-daylight: conic-gradient(
from 315deg, from 0deg,
hsla(50, 20%, 30%, 0.1) , hsla(50, 50%, 80%, 0.7),
hsla(50, 30%, 60%, 0.7) 25%, hsla(50, 50%, 80%, 0.1) 25%,
hsla(50, 20%, 30%, 0.1) 50%, hsla(250, 50%, 20%, 0.1) 25%,
hsla(250, 20%, 30%, 0.1) 50%, hsla(250, 50%, 20%, 0.5) 50%,
hsla(250, 30%, 60%, 0.7) 75%, hsla(250, 50%, 20%, 0.1) 75%,
hsla(250, 20%, 30%, 0.1) hsla(50, 50%, 80%, 0.1) 75%,
hsla(50, 50%, 80%, 0.7)
); );
--gradient-daylight2: radial-gradient(210deg, hsla(50, 30%, 60%, 0.6), hsla(50, 20%, 30%, 0.1) 50%, hsla(250, 20%, 30%, 0.1) 50%, hsla(250, 30%, 60%, 0.6));
--background-custom-button: linear-gradient(to bottom, rgba(33, 55, 74, 0.988) 5%, rgba(21, 40, 51, 0.671) 100%); --background-custom-button: linear-gradient(to bottom, rgba(33, 55, 74, 0.988) 5%, rgba(21, 40, 51, 0.671) 100%);
--background-custom-button-hover: linear-gradient(to bottom, rgb(128, 0, 0) 5%, rgb(62, 1, 1) 100%); --background-custom-button-hover: linear-gradient(to bottom, rgb(128, 0, 0) 5%, rgb(62, 1, 1) 100%);
@ -885,29 +885,46 @@ div.astro-roue {
} }
div.astro-roue div.astro-heure { div.astro-roue div.astro-heure {
position: absolute; position: absolute;
width: 2rem; width: 1.8rem;
height: 2rem; height: 1.8rem;
} }
div.astro-roue div.astro-cercle1 { div.astro-roue div.astro-cercle1 {
position: absolute; position: absolute;
background: var(--gradient-daylight); background: var(--gradient-daylight);
border: 0.2rem solid rgba(100, 45, 124, 0.6); border: 0.2rem solid rgba(100, 45, 124, 0.6);
border-radius: calc(6rem);
top: calc(50% - 6rem);
left: calc(50% - 6rem);
width: calc(100% - 1rem);
height: calc(100% - 1rem);
}
div.astro-roue div.astro-cercle2 {
position: absolute;
border: 0.1rem solid rgba(100, 45, 124, 0.4);
border-radius: calc(6.1rem); border-radius: calc(6.1rem);
top: calc(50% - 6.1rem); top: calc(50% - 4.5rem);
left: calc(50% - 6.1rem); left: calc(50% - 4.5rem);
width: calc(100% - 0.8rem); width: calc(100% - 4rem);
height: calc(100% - 0.8rem); height: calc(100% - 4rem);
} }
div.astro-roue div.astro-disque { div.astro-roue div.astro-disque {
position: absolute; position: absolute;
border: none; border: none;
top: calc(50% - 4rem); top: calc(50% - 3.4rem);
left: calc(50% - 4rem); left: calc(50% - 3.4rem);
width: calc(100% - 5rem); width: calc(100% - 6.2rem);
height: calc(100% - 5rem); height: calc(100% - 6.2rem);
} }
div.astro-roue div.astro-horloge { div.astro-roue div.astro-horloge-heure {
position: absolute;
border: none;
top: calc(50% - 2.5rem);
left: calc(50% - 2.5rem);
width: calc(100% - 8rem);
height: calc(100% - 8rem);
}
div.astro-roue div.astro-horloge-minute {
position: absolute; position: absolute;
border: none; border: none;
top: calc(50% - 3.5rem); top: calc(50% - 3.5rem);
@ -915,7 +932,22 @@ div.astro-roue div.astro-horloge {
width: calc(100% - 6rem); width: calc(100% - 6rem);
height: calc(100% - 6rem); height: calc(100% - 6rem);
} }
div.astro-roue div:is(.astro-disque,.astro-horloge) img { border: none; } div.astro-roue div.astro-ajustement {
position: absolute;
width: 0.8rem;
height: 0.8rem;
color: hsl(120, 50%, 15%);
font-size: 0.8rem;
text-align: center;
vertical-align: middle;
border-radius: 0.4rem;
background-color: hsla(300, 100%, 95%, 0.3);
}
div.astro-roue div.astro-disque img { border: none; }
div.astro-roue div:is(.astro-horloge-heure, .astro-horloge-minute) img {
border: none;
text-shadow: #403f3e;
}
div.astro-roue div.astro-heure img.astro-heure-img { div.astro-roue div.astro-heure img.astro-heure-img {
width: 2rem; width: 2rem;
height: 2rem; height: 2rem;
@ -925,37 +957,32 @@ div.astro-roue div.astro-heure img.astro-heure-img {
opacity: 0.9; opacity: 0.9;
border: none; border: none;
} }
div.astro-roue div.astro-heure.heure-12 { top: calc(50% - 1rem - 1.3rem); left: calc(50% - 1rem - 4.8rem); }
div.astro-roue div.astro-heure.heure-01 { top: calc(50% - 1rem - 3.5rem); left: calc(50% - 1rem - 3.5rem); }
div.astro-roue div.astro-heure.heure-02 { top: calc(50% - 1rem - 4.8rem); left: calc(50% - 1rem - 1.3rem); }
div.astro-roue div.astro-heure.heure-03 { top: calc(50% - 1rem - 4.8rem); left: calc(50% - 1rem + 1.3rem); }
div.astro-roue div.astro-heure.heure-04 { top: calc(50% - 1rem - 3.5rem); left: calc(50% - 1rem + 3.5rem); }
div.astro-roue div.astro-heure.heure-05 { top: calc(50% - 1rem - 1.3rem); left: calc(50% - 1rem + 4.8rem); }
div.astro-roue div.astro-heure.heure-06 { top: calc(50% - 1rem + 1.3rem); left: calc(50% - 1rem + 4.8rem); }
div.astro-roue div.astro-heure.heure-07 { top: calc(50% - 1rem + 3.5rem); left: calc(50% - 1rem + 3.5rem); }
div.astro-roue div.astro-heure.heure-08 { top: calc(50% - 1rem + 4.8rem); left: calc(50% - 1rem + 1.3rem); }
div.astro-roue div.astro-heure.heure-09 { top: calc(50% - 1rem + 4.8rem); left: calc(50% - 1rem - 1.3rem); }
div.astro-roue div.astro-heure.heure-10 { top: calc(50% - 1rem + 3.5rem); left: calc(50% - 1rem - 3.5rem); }
div.astro-roue div.astro-heure.heure-11 { top: calc(50% - 1rem + 1.3rem); left: calc(50% - 1rem - 4.8rem); }
div.astro-roue div.astro-ajustement { div.astro-roue div.astro-heure.heure-01 { top: calc(50% - 1rem + sin(-180deg) * 5rem); left: calc(50% - 1rem + cos(-180deg) * 5rem); }
position: absolute; div.astro-roue div.astro-heure.heure-02 { top: calc(50% - 1rem + sin(-150deg) * 5rem); left: calc(50% - 1rem + cos(-150deg) * 5rem); }
width: 1rem; div.astro-roue div.astro-heure.heure-03 { top: calc(50% - 1rem + sin(-120deg) * 5rem); left: calc(50% - 1rem + cos(-120deg) * 5rem); }
height: 1rem; div.astro-roue div.astro-heure.heure-04 { top: calc(50% - 1rem + sin(-90deg) * 5rem); left: calc(50% - 1rem + cos(-90deg) * 5rem); }
} div.astro-roue div.astro-heure.heure-05 { top: calc(50% - 1rem + sin(-60deg) * 5rem); left: calc(50% - 1rem + cos(-60deg) * 5rem); }
div.astro-roue div.astro-heure.heure-06 { top: calc(50% - 1rem + sin(-30deg) * 5rem); left: calc(50% - 1rem + cos(-30deg) * 5rem); }
div.astro-roue div.astro-heure.heure-07 { top: calc(50% - 1rem + sin(-0deg) * 5rem); left: calc(50% - 1rem + cos(-0deg) * 5rem); }
div.astro-roue div.astro-heure.heure-08 { top: calc(50% - 1rem + sin(30deg) * 5rem); left: calc(50% - 1rem + cos(30deg) * 5rem); }
div.astro-roue div.astro-heure.heure-09 { top: calc(50% - 1rem + sin(60deg) * 5rem); left: calc(50% - 1rem + cos(60deg) * 5rem); }
div.astro-roue div.astro-heure.heure-10 { top: calc(50% - 1rem + sin(90deg) * 5rem); left: calc(50% - 1rem + cos(90deg) * 5rem); }
div.astro-roue div.astro-heure.heure-11 { top: calc(50% - 1rem + sin(120deg) * 5rem); left: calc(50% - 1rem + cos(120deg) * 5rem); }
div.astro-roue div.astro-heure.heure-12 { top: calc(50% - 1rem + sin(150deg) * 5rem); left: calc(50% - 1rem + cos(150deg) * 5rem); }
div.astro-roue div.astro-ajustement.ajustement-12 { top: calc(50% - 0.5rem - 0.8rem); left: calc(50% - 0.5rem - 2.9rem); } div.astro-roue div.astro-ajustement.heure-01 { top: calc(50% - 0.4rem + sin(180deg) * 3.9rem); left: calc(50% - 0.4rem + cos(180deg) * 3.9rem); }
div.astro-roue div.astro-ajustement.ajustement-01 { top: calc(50% - 0.5rem - 2.1rem); left: calc(50% - 0.5rem - 2.1rem); } div.astro-roue div.astro-ajustement.heure-02 { top: calc(50% - 0.4rem + sin(-150deg) * 3.9rem); left: calc(50% - 0.4rem + cos(-150deg) * 3.9rem); }
div.astro-roue div.astro-ajustement.ajustement-02 { top: calc(50% - 0.5rem - 2.9rem); left: calc(50% - 0.5rem - 0.8rem); } div.astro-roue div.astro-ajustement.heure-03 { top: calc(50% - 0.4rem + sin(-120deg) * 3.9rem); left: calc(50% - 0.4rem + cos(-120deg) * 3.9rem); }
div.astro-roue div.astro-ajustement.ajustement-03 { top: calc(50% - 0.5rem - 2.9rem); left: calc(50% - 0.5rem + 0.8rem); } div.astro-roue div.astro-ajustement.heure-04 { top: calc(50% - 0.4rem + sin(-90deg) * 3.9rem); left: calc(50% - 0.4rem + cos(-90deg) * 3.9rem); }
div.astro-roue div.astro-ajustement.ajustement-04 { top: calc(50% - 0.5rem - 2.1rem); left: calc(50% - 0.5rem + 2.1rem); } div.astro-roue div.astro-ajustement.heure-05 { top: calc(50% - 0.4rem + sin(-60deg) * 3.9rem); left: calc(50% - 0.4rem + cos(-60deg) * 3.9rem); }
div.astro-roue div.astro-ajustement.ajustement-05 { top: calc(50% - 0.5rem - 0.8rem); left: calc(50% - 0.5rem + 2.9rem); } div.astro-roue div.astro-ajustement.heure-06 { top: calc(50% - 0.4rem + sin(-30deg) * 3.9rem); left: calc(50% - 0.4rem + cos(-30deg) * 3.9rem); }
div.astro-roue div.astro-ajustement.ajustement-06 { top: calc(50% - 0.5rem + 0.8rem); left: calc(50% - 0.5rem + 2.9rem); } div.astro-roue div.astro-ajustement.heure-07 { top: calc(50% - 0.4rem + sin(0deg) * 3.9rem); left: calc(50% - 0.4rem + cos(0deg) * 3.9rem); }
div.astro-roue div.astro-ajustement.ajustement-07 { top: calc(50% - 0.5rem + 2.1rem); left: calc(50% - 0.5rem + 2.1rem); } div.astro-roue div.astro-ajustement.heure-08 { top: calc(50% - 0.4rem + sin(30deg) * 3.9rem); left: calc(50% - 0.4rem + cos(30deg) * 3.9rem); }
div.astro-roue div.astro-ajustement.ajustement-08 { top: calc(50% - 0.5rem + 2.9rem); left: calc(50% - 0.5rem + 0.8rem); } div.astro-roue div.astro-ajustement.heure-09 { top: calc(50% - 0.4rem + sin(60deg) * 3.9rem); left: calc(50% - 0.4rem + cos(60deg) * 3.9rem); }
div.astro-roue div.astro-ajustement.ajustement-09 { top: calc(50% - 0.5rem + 2.9rem); left: calc(50% - 0.5rem - 0.8rem); } div.astro-roue div.astro-ajustement.heure-10 { top: calc(50% - 0.4rem + sin(90deg) * 3.9rem); left: calc(50% - 0.4rem + cos(90deg) * 3.9rem); }
div.astro-roue div.astro-ajustement.ajustement-10 { top: calc(50% - 0.5rem + 2.1rem); left: calc(50% - 0.5rem - 2.1rem); } div.astro-roue div.astro-ajustement.heure-11 { top: calc(50% - 0.4rem + sin(120deg) * 3.9rem); left: calc(50% - 0.4rem + cos(120deg) * 3.9rem); }
div.astro-roue div.astro-ajustement.ajustement-11 { top: calc(50% - 0.5rem + 0.8rem); left: calc(50% - 0.5rem - 2.9rem); } div.astro-roue div.astro-ajustement.heure-12 { top: calc(50% - 0.4rem + sin(150deg) * 3.9rem); left: calc(50% - 0.4rem + cos(150deg) * 3.9rem); }
.window-app .window-content, .window-app.sheet .window-content .sheet-body{ .window-app .window-content, .window-app.sheet .window-content .sheet-body{
background: rgb(245,245,240) url(img/bg_left.webp) no-repeat left top; background: rgb(245,245,240) url(img/bg_left.webp) no-repeat left top;

View File

@ -1,8 +1,8 @@
{ {
"id": "foundryvtt-reve-de-dragon", "id": "foundryvtt-reve-de-dragon",
"title": "Rêve de Dragon", "title": "Rêve de Dragon",
"version": "10.6.23", "version": "10.6.24",
"download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.6.23.zip", "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.6.24.zip",
"manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v10/system.json", "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v10/system.json",
"compatibility": { "compatibility": {
"minimum": "10", "minimum": "10",

View File

@ -18,7 +18,7 @@
<section class="sheet-body"> <section class="sheet-body">
<div class="tab items flexcol" data-group="primary" data-tab="informations"> <div class="tab items flexcol" data-group="primary" data-tab="informations">
<div class="form-group"> <div class="form-group">
<label>Fréquence</label> <label for="system.rarete">Fréquence</label>
<select name="system.rarete" class="rarete" data-dtype="String"> <select name="system.rarete" class="rarete" data-dtype="String">
{{#select system.rarete}} {{#select system.rarete}}
<option value=""></option> <option value=""></option>
@ -27,75 +27,69 @@
</select> </select>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Catégorie</label> <label for="system.categorie">Catégorie</label>
<select name="system.categorie" class="categoriepotion" data-dtype="String"> <select name="system.categorie" class="categoriepotion" data-dtype="String">
{{#select system.categorie}} {{#select system.categorie}}
{{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-potion.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-potion.html"}}
{{/select}} {{/select}}
</select> </select>
</div> </div>
{{#if isSoins}} {{#if (or isSoins isRepos)}}
<div class="form-group"> <div class="form-group">
<label>Herbe</label> <label for="system.herbe">Herbe</label>
<select name="system.herbe" class="herbe" data-dtype="String"> <select name="system.herbe" class="herbe" data-dtype="String">
{{selectOptions herbesSoins selected=system.herbe localize=false}} {{#if isSoins}}
</select> {{selectOptions herbesSoins selected=system.herbe localize=false}}
</div> {{/if}}
<div class="form-group"> {{#if isRepos}}
<label>Nombre de brins</label> {{selectOptions herbesRepos selected=system.herbe localize=false}}
<input class="attribute-value" type="text" name="system.herbebrins" value="{{system.herbebrins}}" data-dtype="Number" /> {{/if}}
</div> </select>
<div class="form-group"> </div>
<label>Bonus</label> <div class="form-group">
<input class="attribute-value" type="text" name="system.herbebonus" value="{{system.herbebonus}}" data-dtype="Number" /> <label for="system.herbebrins">Nombre de brins</label>
</div> <input class="attribute-value" type="text" name="system.herbebrins" value="{{system.herbebrins}}" data-dtype="Number" />
{{/if}} </div>
{{#if isRepos}} <div class="form-group">
<div class="form-group"> <label for="system.herbebonus">Bonus</label>
<label>Herbe</label> <input class="attribute-value" type="text" name="system.herbebonus" value="{{system.herbebonus}}" data-dtype="Number" />
<select name="system.herbe" class="herbe" data-dtype="String"> </div>
{{selectOptions herbesRepos selected=system.herbe localize=false}} {{#if isRepos}}
</select> <div class="form-group">
</div> <label for="system.reposalchimique">Repos Alchimique ?</label>
<div class="form-group"> <input class="attribute-value" type="checkbox" name="system.reposalchimique" {{#if system.reposalchimique}}checked{{/if}}/>
<label>Nombre de brins</label> </div>
<input class="attribute-value" type="text" name="system.herbebrins" value="{{system.herbebrins}}" data-dtype="Number" /> {{/if}}
</div> {{/if}}
<div class="form-group"> {{#if system.magique}}
<label>Bonus</label> <div class="form-group">
<input class="attribute-value" type="text" name="system.herbebonus" value="{{system.herbebonus}}" data-dtype="Number" /> <label for="system.pr">Points de rêve</label>
</div> <input class="attribute-value" type="text" name="system.pr" value="{{system.pr}}" data-dtype="Number" />
<div class="form-group"> </div>
<label>Repos Alchimique ?</label> <div class="form-group">
<input class="attribute-value" type="checkbox" name="system.reposalchimique" {{#if system.reposalchimique}}checked{{/if}}/> <label for="system.prpermanent">Permanente ? </label>
</div> <input class="attribute-value" type="checkbox" name="system.prpermanent" {{#if system.prpermanent}}checked{{/if}}/>
{{/if}} </div>
{{#if system.magique}} {{#if (or isSoins isRepos)}}
<div class="form-group"> <div class="form-group">
<label>Points de rêve</label> <label>Points de
<input class="attribute-value" type="text" name="system.pr" value="{{system.pr}}" data-dtype="Number" /> {{#if isSoins}}guérison{{/if}}
</div> {{#if isRepos}}repos{{/if}}
<div class="form-group"> </label>
<label for="xp">Permanente ? </label> <label>{{system.puissance}}</label>
<input class="attribute-value" type="checkbox" name="system.prpermanent" {{#if system.prpermanent}}checked{{/if}}/> </div>
</div> {{/if}}
{{#if isSoins}} <div class="form-group">
<div class="form-group"> <label for="enchantement.jour">Date de l'Enchantement : Jour/Mois (date actuelle : {{dateActuelle}})</label>
<label for="xp">Points de guérison </label> </div>
<label for="xp">{{pointsGuerison}}</label> <div class="form-group">
</div> <input type="number" name="enchantement.jour" class="date-enchantement" value="{{enchantement.jour}}" data-dtype="Number" min="1" max="28"/>
{{/if}} <select name="enchantement.mois" class="date-enchantement" data-dtype="String">
<div class="form-group"> {{#select enchantement.mois}}
<label>Date de l'Enchantement : Jour/Mois (date actuelle : {{dateActuelle}})</label> {{>"systems/foundryvtt-reve-de-dragon/templates/enum-heures.html"}}
</div> {{/select}}
<div class="form-group"> </select>
<input type="number" name="enchantement.jour" class="date-enchantement" value="{{enchantement.jour}}" data-dtype="Number" min="1" max="28"/> </div>
<select name="enchantement.mois" class="date-enchantement" data-dtype="String">
{{#select enchantement.mois}}
{{>"systems/foundryvtt-reve-de-dragon/templates/enum-heures.html"}}
{{/select}}
</select>
</div>
{{/if}} {{/if}}
{{>"systems/foundryvtt-reve-de-dragon/templates/item/partial-inventaire.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/item/partial-inventaire.html"}}

View File

@ -21,15 +21,19 @@
<div><label>Heures de chance et malchance</label></div> <div><label>Heures de chance et malchance</label></div>
<div class="astro-roue"> <div class="astro-roue">
<div class="astro-cercle1"></div> <div class="astro-cercle1"></div>
{{#each heures as |heure|}}
<div class="astro-ajustement heure-{{heure.hh}}"></div>
<div class="astro-heure heure-{{heure.hh}}"><img class="astro-heure-img" src="{{heure.webp}}" title="{{heure.label}}"></div>
{{/each}}
<div class="astro-cercle2"></div>
<div class="astro-disque"> <div class="astro-disque">
<img src="systems/foundryvtt-reve-de-dragon/styles/img/ui/astro-disque.svg" alt=""> <img src="systems/foundryvtt-reve-de-dragon/styles/img/ui/astro-disque.svg" alt="">
</div> </div>
{{#each heures as |heure|}} <div class="astro-horloge-heure">
<div class="astro-heure heure-{{heure.hh}}"><img class="astro-heure-img" src="{{heure.webp}}" title="{{heure.label}}"></div>
<div class="astro-ajustement ajustement-{{heure.hh}}"></div>
{{/each}}
<div class="astro-horloge">
<img src="systems/foundryvtt-reve-de-dragon/styles/img/ui/rdd-aiguille-horloge.svg" alt=""> <img src="systems/foundryvtt-reve-de-dragon/styles/img/ui/rdd-aiguille-horloge.svg" alt="">
</div> </div>
<div class="astro-horloge-minute">
<img src="systems/foundryvtt-reve-de-dragon/styles/img/ui/rdd-aiguille-minute.svg" alt="">
</div>
</div> </div>
</div> </div>