Compare commits

..

27 Commits

Author SHA1 Message Date
9ee14b3b56 Add .db again? 2023-06-04 22:17:02 +02:00
3203fae111 Add .db again? 2023-06-04 20:53:15 +02:00
755301275b Add .db again? 2023-06-04 20:51:49 +02:00
f6d5dc9d7c Add .db again? 2023-06-04 20:49:55 +02:00
5e9b47af1f Add .db again? 2023-06-04 20:47:47 +02:00
18dfb36a78 v11 release 2023-05-29 13:47:08 +02:00
febccd508f v11 release 2023-05-29 13:40:38 +02:00
b147f8937b v11 release 2023-05-29 13:33:31 +02:00
55a93b317a v10/v11 compat 2023-05-29 08:50:13 +02:00
02a630152d v10/v11 compat 2023-05-29 08:50:08 +02:00
ad8ac0de77 v10/v11 compat 2023-05-29 08:42:16 +02:00
dceb6f026f v10/v11 compat 2023-05-29 08:41:59 +02:00
ad37ee1b8e v10/v11 compat 2023-05-29 08:38:22 +02:00
4d40e2fe59 Merge pull request 'cherry-pick changements v10' (#647) from VincentVk/foundryvtt-reve-de-dragon:v11 into v11
Reviewed-on: #647
2023-05-29 07:47:58 +02:00
9d7e57d9fb Changelog v11 2023-05-28 22:11:16 +02:00
717029e572 Tri des listes d'items 2023-05-28 22:11:16 +02:00
d6f8976298 Utilisation de la dateReel du calendrier 2023-05-28 22:11:16 +02:00
92e93cbbea Refonte du journal d'expérience
Reprise du journal d'expérience pour:
- afficher ancienne/nouvelle valeur
- la valeur du changement
- si c'est manuel / automatique
- identifier les dépenses de stress
- identifier les augmentations de compétences
- les changements des compteurs
2023-05-28 22:11:16 +02:00
994eaad9a9 Ajout des acteurs accordés aux entités 2023-05-28 22:11:16 +02:00
cfed7e2afa v10/v11 compat 2023-05-25 21:16:59 +02:00
436f9e6fa4 v10/v11 compat 2023-05-25 21:06:03 +02:00
18a50197cd v10/v11 compat 2023-05-25 21:05:43 +02:00
b6910612f8 v10/v11 compat 2023-05-25 21:04:27 +02:00
4ba1ec8a2e v10/v11 compat 2023-05-25 21:04:02 +02:00
75a0f7c322 v10/v11 compat 2023-05-25 20:40:59 +02:00
e2a9f55740 Initial commit for v11 support 2023-05-25 20:39:53 +02:00
1e0788cde8 Merge pull request 'v11' (#645) from VincentVk/foundryvtt-reve-de-dragon:v11 into v11
Reviewed-on: #645
2023-05-25 20:37:01 +02:00
10 changed files with 219 additions and 110 deletions

4
.gitignore vendored
View File

@ -8,3 +8,7 @@ todo.md
/jsconfig.json
/package.json
/package-lock.json
/packs/*/
/packs/*/CURRENT
/packs/*/LOG
/packs/*/LOCK

View File

@ -1,4 +1,7 @@
---
# v11.0
# v10.7 - L'os de Semolosse
## v10.7.14 - l'expérience de Semolosse

View File

@ -1,54 +1,56 @@
{
"ACTOR": {
"TypePersonnage": "Personnage",
"TypeCreature": "Créature",
"TypeEntite": "Entité de cauchemar",
"TypeCommerce": "Commerce",
"TypeVehicule": "Véhicule"
},
"ITEM": {
"TypeArme": "Arme",
"TypeArmure": "Armure",
"TypeBlessure": "Blessure",
"TypeCasetmr": "TMR spéciale",
"TypeChant": "Chant",
"TypeCompetence": "Compétence",
"TypeCompetencecreature": "Compétence de créature",
"TypeConteneur": "Conteneur",
"TypeDanse": "Danse",
"TypeExtraitpoetique": "Extrait poetique",
"TypeFaune": "Faune",
"TypeGemme": "Gemme",
"TypeHerbe": "Herbe",
"TypeIngredient": "Ingrédient",
"TypeJeu": "Jeu",
"TypeLivre": "Livre",
"TypeMaladie": "Maladie",
"TypeMeditation": "Méditation",
"TypeMonnaie": "Monnaie",
"TypeMunition": "Munition",
"TypeMusique": "Musique",
"TypeNombreastral": "Nombre astral",
"TypeNourritureboisson": "Nourriture & boisson",
"TypeObjet": "Objet",
"TypeOeuvre": "Oeuvre",
"TypeOmbre": "Ombre de Thanatos",
"TypePlante": "Plante",
"TypePoison": "Poison",
"TypePossession": "Possession",
"TypePotion": "Potion",
"TypeQueue": "Queue de Dragon",
"TypeRecettealchimique": "Recette alchimique",
"TypeRecettecuisine": "Recette de cuisine",
"TypeRencontre": "Rencontre TMR",
"TypeService": "Service",
"TypeSignedraconique": "Signe draconique",
"TypeSort": "Sort",
"TypeSortreserve": "Sort en réserve",
"TypeSouffle": "Souffle de Dragon",
"TypeTache": "Tâche",
"TypeTarot": "Carte de tarot",
"TypeTete": "te de Dragon"
"TYPES": {
"Actor": {
"Personnage": "Personnage",
"Creature": "Créature",
"Entite": "Entité de cauchemar",
"Commerce": "Commerce",
"Vehicule": "Véhicule"
},
"Item": {
"Arme": "Arme",
"Armure": "Armure",
"Blessure": "Blessure",
"Casetmr": "TMR spéciale",
"Chant": "Chant",
"Competence": "Compétence",
"Competencecreature": "Compétence de créature",
"Conteneur": "Conteneur",
"Danse": "Danse",
"Extraitpoetique": "Extrait poetique",
"Faune": "Faune",
"Gemme": "Gemme",
"Herbe": "Herbe",
"Ingredient": "Ingrédient",
"Jeu": "Jeu",
"Livre": "Livre",
"Maladie": "Maladie",
"Meditation": "Méditation",
"Monnaie": "Monnaie",
"Munition": "Munition",
"Musique": "Musique",
"Nombreastral": "Nombre astral",
"Nourritureboisson": "Nourriture & boisson",
"Objet": "Objet",
"Oeuvre": "Oeuvre",
"Ombre": "Ombre de Thanatos",
"Plante": "Plante",
"Poison": "Poison",
"Possession": "Possession",
"Potion": "Potion",
"Queue": "Queue de Dragon",
"Recettealchimique": "Recette alchimique",
"Recettecuisine": "Recette de cuisine",
"Rencontre": "Rencontre TMR",
"Service": "Service",
"Signedraconique": "Signe draconique",
"Sort": "Sort",
"Sortreserve": "Sort en réserve",
"Souffle": "Souffle de Dragon",
"Tache": "Tâche",
"Tarot": "Carte de tarot",
"Tete": "Tête de Dragon"
}
},
"EFFECT": {
"StatusStunned": "Sonné",

View File

@ -1052,6 +1052,7 @@ export class RdDTMRDialog extends Dialog {
/* -------------------------------------------- */
static _computeEventOddq(origEvent) {
console.log("EVENT", origEvent)
let canvasRect = origEvent.target.getBoundingClientRect();
let x = origEvent.clientX - canvasRect.left;
let y = origEvent.clientY - canvasRect.top;

View File

@ -105,10 +105,11 @@ export class RdDCalendrier extends Application {
}
return buttons
}
async maximize() {
/*async maximize() {
await super.maximize()
this.render(true)
}
}*/
async close() { }
@ -273,6 +274,7 @@ export class RdDCalendrier extends Application {
/* -------------------------------------------- */
async rebuildNombresAstraux(showDice = HIDE_DICE) {
if (Misc.isUniqueConnectedGM()) {
console.log("Astral rebuild")
let newList = [];
for (let i = 0; i < MAX_NOMBRE_ASTRAL; i++) {
let dayIndex = this.timestamp.indexDate + i;

View File

@ -1,8 +1,10 @@
import { Draconique } from "./draconique.js";
import { PixiTMR } from "./pixi-tmr.js";
export class CarteTmr extends Draconique {
constructor() {
console.log("Sprite create 1!!!!")
super();
}

View File

@ -91,6 +91,8 @@ export class Draconique {
coordTMR: coordTMR
};
token[type ?? this.code()] = linkData;
console.log("SPRITE: ", token.sprite)
//PixiTMR.getImgFromCode()
pixiTMR.addTooltip(token.sprite, this.tooltip(linkData));
return token;
}

View File

@ -20,18 +20,20 @@ export class PixiTMR {
this.callbacksOnAnimate = [];
}
load( onLoad = (loader, resources) => {} ) {
let loader = this.pixiApp.loader;
async load( onLoad = (loader, resources) => {} ) {
// WIP - Deprecated since v7 : let loader = new PIXI.Loader();
for (const [name, img] of Object.entries(PixiTMR.textures)) {
loader = loader.add(name, img);
const texture = await PIXI.Assets.load(img);
let image = PIXI.Sprite.from(texture);
}
loader.onError.add((error, reason) => { console.log("ERROR", error, reason) });
loader.load( (loader, resources) => {
onLoad(loader, resources);
for (let onAnimate of this.callbacksOnAnimate) {
onAnimate();
}
});
onLoad();
for (let onAnimate of this.callbacksOnAnimate) {
onAnimate();
}
}
static getImgFromCode(code) {
return PixiTMR.textures[code]
}
static register(name, img) {
@ -44,7 +46,9 @@ export class PixiTMR {
}
carteTmr(code) {
const carteTmr = new PIXI.Sprite(PIXI.utils.TextureCache[code]);
let img = PixiTMR.getImgFromCode(code)
const carteTmr = new PIXI.Sprite(PIXI.utils.TextureCache[img]);
console.log(code, carteTmr)
// Setup the position of the TMR
carteTmr.x = 0;
carteTmr.y = 0;
@ -52,7 +56,8 @@ export class PixiTMR {
carteTmr.height = 860;
// Rotate around the center
carteTmr.anchor.set(0);
carteTmr.interactive = true;
carteTmr.eventMode = 'dynamic'; // PIXI 7 : Not sure ..
// This one is deprecated ; carteTmr.interactive = true;
carteTmr.buttonMode = true;
carteTmr.tmrObject = this;
if (!this.tmrObject.viewOnly) {
@ -63,9 +68,10 @@ export class PixiTMR {
}
sprite(code, options = {}) {
const texture = PIXI.utils.TextureCache[code];
let img = PixiTMR.getImgFromCode(code)
const texture = PIXI.utils.TextureCache[img];
if (!texture) {
console.error("Texture manquante", code)
console.error("Texture manquante", code, PIXI.utils.TextureCache)
return;
}
let sprite = new PIXI.Sprite(texture);
@ -97,7 +103,8 @@ export class PixiTMR {
sprite.tooltip = new PIXI.Text(text, tooltipStyle);
sprite.tooltip.zIndex = tmrTokenZIndex.tooltip;
sprite.isOver = false;
sprite.interactive = true;
// Deprecated : sprite.interactive = true;
sprite.eventMode = 'dynamic'; // PIXI 7 To be checked
sprite.on('pointerdown', event => this.onClickBackground(event))
.on('pointerover', () => this.onShowTooltip(sprite))
.on('pointerout', () => this.onHideTooltip(sprite));

File diff suppressed because one or more lines are too long

View File

@ -1,13 +1,13 @@
{
"id": "foundryvtt-reve-de-dragon",
"title": "Rêve de Dragon",
"version": "10.7.15",
"download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.7.15.zip",
"manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v10/system.json",
"version": "11.0.4",
"download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-11.0.4.zip",
"manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v11/system.json",
"compatibility": {
"minimum": "10",
"verified": "10",
"maximum": "10"
"minimum": "11",
"verified": "11",
"maximum": "11"
},
"description": "Rêve de Dragon RPG for FoundryVTT",
"authors": [
@ -69,7 +69,10 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/competences.db",
"type": "Item",
"private": true,
"ownership": {
"PLAYER": "NONE",
"ASSISTANT": "OWNER"
},
"flags": {}
},
{
@ -78,7 +81,9 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/arts-et-divertissements.db",
"type": "Item",
"private": false,
"ownership": {
"PLAYER": "OBSERVER"
},
"flags": {}
},
{
@ -87,7 +92,10 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/competences-creatures.db",
"type": "Item",
"private": true,
"ownership": {
"PLAYER": "NONE",
"ASSISTANT": "OWNER"
},
"flags": {}
},
{
@ -96,7 +104,10 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/competences-entites.db",
"type": "Item",
"private": true,
"ownership": {
"PLAYER": "NONE",
"ASSISTANT": "OWNER"
},
"flags": {}
},
{
@ -105,7 +116,9 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/sorts-oniros.db",
"type": "Item",
"private": false,
"ownership": {
"PLAYER": "OBSERVER"
},
"flags": {}
},
{
@ -114,7 +127,9 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/sorts-hypnos.db",
"type": "Item",
"private": false,
"ownership": {
"PLAYER": "OBSERVER"
},
"flags": {}
},
{
@ -123,7 +138,9 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/sorts-narcos.db",
"type": "Item",
"private": false,
"ownership": {
"PLAYER": "OBSERVER"
},
"flags": {}
},
{
@ -132,7 +149,9 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/sorts-thanatos.db",
"type": "Item",
"private": false,
"ownership": {
"PLAYER": "OBSERVER"
},
"flags": {}
},
{
@ -141,7 +160,9 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/equipement.db",
"type": "Item",
"private": false,
"ownership": {
"PLAYER": "OBSERVER"
},
"flags": {}
},
{
@ -150,7 +171,10 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/maladies-et-poisons.db",
"type": "Item",
"private": true,
"ownership": {
"PLAYER": "NONE",
"ASSISTANT": "OWNER"
},
"flags": {}
},
{
@ -159,7 +183,9 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/rappel-des-regles.db",
"type": "JournalEntry",
"private": false,
"ownership": {
"PLAYER": "OBSERVER"
},
"flags": {}
},
{
@ -168,7 +194,9 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/macros.db",
"type": "Macro",
"private": false,
"ownership": {
"PLAYER": "OBSERVER"
},
"flags": {}
},
{
@ -177,7 +205,10 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/queues-de-dragon.db",
"type": "Item",
"private": true,
"ownership": {
"PLAYER": "NONE",
"ASSISTANT": "OWNER"
},
"flags": {}
},
{
@ -186,7 +217,10 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/ombres-de-thanatos.db",
"type": "Item",
"private": true,
"ownership": {
"PLAYER": "NONE",
"ASSISTANT": "OWNER"
},
"flags": {}
},
{
@ -195,7 +229,10 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/souffles-de-dragon.db",
"type": "Item",
"private": true,
"ownership": {
"PLAYER": "NONE",
"ASSISTANT": "OWNER"
},
"flags": {}
},
{
@ -204,7 +241,9 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/tarot-draconique.db",
"type": "Item",
"private": false,
"ownership": {
"PLAYER": "OBSERVER"
},
"flags": {}
},
{
@ -213,7 +252,9 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/extrait-poetique.db",
"type": "Item",
"private": false,
"ownership": {
"PLAYER": "OBSERVER"
},
"flags": {}
},
{
@ -222,7 +263,10 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/tetes-de-dragon-pour-haut-revants.db",
"type": "Item",
"private": true,
"ownership": {
"PLAYER": "NONE",
"ASSISTANT": "OWNER"
},
"flags": {}
},
{
@ -231,7 +275,10 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/tetes-de-dragon-pour-tous-personnages.db",
"type": "Item",
"private": true,
"ownership": {
"PLAYER": "NONE",
"ASSISTANT": "OWNER"
},
"flags": {}
},
{
@ -240,7 +287,10 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/rencontres.db",
"type": "Item",
"private": true,
"ownership": {
"PLAYER": "NONE",
"ASSISTANT": "OWNER"
},
"flags": {}
},
{
@ -249,7 +299,10 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/tables-diverses.db",
"type": "RollTable",
"private": true,
"ownership": {
"PLAYER": "NONE",
"ASSISTANT": "OWNER"
},
"flags": {}
},
{
@ -258,7 +311,10 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/animaux.db",
"type": "Actor",
"private": true,
"ownership": {
"PLAYER": "NONE",
"ASSISTANT": "OWNER"
},
"flags": {}
},
{
@ -267,7 +323,10 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/voyageurs.db",
"type": "Actor",
"private": false,
"ownership": {
"PLAYER": "NONE",
"ASSISTANT": "OWNER"
},
"flags": {}
},
{
@ -276,7 +335,10 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/vehicules.db",
"type": "Actor",
"private": true,
"ownership": {
"PLAYER": "NONE",
"ASSISTANT": "OWNER"
},
"flags": {}
},
{
@ -285,7 +347,10 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/archetypes.db",
"type": "Actor",
"private": true,
"ownership": {
"PLAYER": "NONE",
"ASSISTANT": "OWNER"
},
"flags": {}
},
{
@ -294,7 +359,10 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/humanoides.db",
"type": "Actor",
"private": true,
"ownership": {
"PLAYER": "NONE",
"ASSISTANT": "OWNER"
},
"flags": {}
},
{
@ -303,7 +371,10 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/entites-de-cauchemar.db",
"type": "Actor",
"private": true,
"ownership": {
"PLAYER": "NONE",
"ASSISTANT": "OWNER"
},
"flags": {}
},
{
@ -312,7 +383,10 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/invocations.db",
"type": "Actor",
"private": true,
"ownership": {
"PLAYER": "NONE",
"ASSISTANT": "OWNER"
},
"flags": {}
},
{
@ -321,7 +395,10 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/faune-flore-mineraux.db",
"type": "Item",
"private": true,
"ownership": {
"PLAYER": "NONE",
"ASSISTANT": "OWNER"
},
"flags": {}
},
{
@ -330,7 +407,10 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/meditations-et-ecrits.db",
"type": "Item",
"private": true,
"ownership": {
"PLAYER": "NONE",
"ASSISTANT": "OWNER"
},
"flags": {}
},
{
@ -339,7 +419,10 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/recettes-alchimiques.db",
"type": "Item",
"private": true,
"ownership": {
"PLAYER": "NONE",
"ASSISTANT": "OWNER"
},
"flags": {}
},
{
@ -348,7 +431,10 @@
"system": "foundryvtt-reve-de-dragon",
"path": "packs/scenes-rdd.db",
"type": "Scene",
"private": true,
"ownership": {
"PLAYER": "NONE",
"ASSISTANT": "OWNER"
},
"flags": {}
}
],