Max release = v10

Merge pull request 'v10.7.14 - l'expérience de Sémolosse' (#646 ) from VincentVk/foundryvtt-reve-de-dragon:v10 into v10
Reviewed-on: #646
2023-05-29 13:32:22 +02:00 · 2023-05-29 07:46:20 +02:00 · 2023-05-28 22:05:36 +02:00 · 2023-05-28 22:05:09 +02:00 · 2023-05-28 22:04:03 +02:00 · 2023-05-28 22:03:57 +02:00
10 changed files with 110 additions and 219 deletions
--- a/.gitignore
+++ b/.gitignore
@ -8,7 +8,3 @@ todo.md
 /jsconfig.json
 /package.json
 /package-lock.json
-/packs/*/
-/packs/*/CURRENT
-/packs/*/LOG
-/packs/*/LOCK
--- a/changelog.md
+++ b/changelog.md
@ -1,7 +1,4 @@
 --- 
-
-# v11.0 
-
 # v10.7 - L'os de Semolosse

 ## v10.7.14 - l'expérience de Semolosse
--- a/lang/fr.json
+++ b/lang/fr.json
@ -1,56 +1,54 @@
 {
-  "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"
-    }
+  "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": "Tête de Dragon"
  },
  "EFFECT": {
    "StatusStunned": "Sonné",
--- a/module/rdd-tmr-dialog.js
+++ b/module/rdd-tmr-dialog.js
@ -1052,7 +1052,6 @@ 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;
--- a/module/time/rdd-calendrier.js
+++ b/module/time/rdd-calendrier.js
@ -105,11 +105,10 @@ export class RdDCalendrier extends Application {
    }
    return buttons
  }
-
-  /*async maximize() {
+  async maximize() {
    await super.maximize()
    this.render(true)
-  }*/
+  }

  async close() { }

@ -274,7 +273,6 @@ 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;
--- a/module/tmr/carte-tmr.js
+++ b/module/tmr/carte-tmr.js
@ -1,10 +1,8 @@
 import { Draconique } from "./draconique.js";
-import { PixiTMR } from "./pixi-tmr.js";

 export class CarteTmr extends Draconique {

  constructor() {
-    console.log("Sprite create 1!!!!")
    super();
  }

--- a/module/tmr/draconique.js
+++ b/module/tmr/draconique.js
@ -91,8 +91,6 @@ 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;
  }
--- a/module/tmr/pixi-tmr.js
+++ b/module/tmr/pixi-tmr.js
@ -20,20 +20,18 @@ export class PixiTMR {
    this.callbacksOnAnimate = [];
  }

-  async load( onLoad = (loader, resources) => {} )  {
-    // WIP - Deprecated since v7 : let loader = new PIXI.Loader();
+  load( onLoad = (loader, resources) => {} ) {
+    let loader = this.pixiApp.loader;
    for (const [name, img] of Object.entries(PixiTMR.textures)) {
-      const texture = await PIXI.Assets.load(img);
-      let image = PIXI.Sprite.from(texture);
+      loader = loader.add(name, img);
    }
-    onLoad();
-    for (let onAnimate of this.callbacksOnAnimate) {
-      onAnimate();
-    }
-  }
-
-  static getImgFromCode(code) {
-    return PixiTMR.textures[code]
+    loader.onError.add((error, reason) => { console.log("ERROR", error, reason) });
+    loader.load( (loader, resources) =>  {
+      onLoad(loader, resources);
+      for (let onAnimate of this.callbacksOnAnimate) {
+        onAnimate();
+      }
+    });
  }

  static register(name, img) {
@ -46,9 +44,7 @@ export class PixiTMR {
  }

  carteTmr(code) {
-    let img = PixiTMR.getImgFromCode(code)
-    const carteTmr = new PIXI.Sprite(PIXI.utils.TextureCache[img]);
-    console.log(code, carteTmr)
+    const carteTmr = new PIXI.Sprite(PIXI.utils.TextureCache[code]);
    // Setup the position of the TMR
    carteTmr.x = 0;
    carteTmr.y = 0;
@ -56,8 +52,7 @@ export class PixiTMR {
    carteTmr.height = 860;
    // Rotate around the center
    carteTmr.anchor.set(0);
-    carteTmr.eventMode = 'dynamic'; // PIXI 7 : Not sure ..
-    // This one is deprecated ; carteTmr.interactive = true;
+    carteTmr.interactive = true;
    carteTmr.buttonMode = true;
    carteTmr.tmrObject = this;
    if (!this.tmrObject.viewOnly) {
@ -68,10 +63,9 @@ export class PixiTMR {
  }

  sprite(code, options = {}) {
-    let img = PixiTMR.getImgFromCode(code)
-    const texture = PIXI.utils.TextureCache[img];
+    const texture = PIXI.utils.TextureCache[code];
    if (!texture) {
-      console.error("Texture manquante", code, PIXI.utils.TextureCache)
+      console.error("Texture manquante", code)
      return;
    }  
    let sprite = new PIXI.Sprite(texture);
@ -103,8 +97,7 @@ export class PixiTMR {
      sprite.tooltip = new PIXI.Text(text, tooltipStyle);
      sprite.tooltip.zIndex = tmrTokenZIndex.tooltip;
      sprite.isOver = false;
-      // Deprecated : sprite.interactive = true; 
-      sprite.eventMode = 'dynamic'; // PIXI 7 To be checked
+      sprite.interactive = true;
      sprite.on('pointerdown', event => this.onClickBackground(event))
        .on('pointerover', () => this.onShowTooltip(sprite))
        .on('pointerout', () => this.onHideTooltip(sprite));
--- a/packs/archetypes.db
+++ b/packs/archetypes.db
--- a/system.json
+++ b/system.json
@ -1,13 +1,13 @@
 {
  "id": "foundryvtt-reve-de-dragon",
  "title": "Rêve de Dragon",
-  "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",
+  "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",
  "compatibility": {
-    "minimum": "11",
-    "verified": "11",
-    "maximum": "11"
+    "minimum": "10",
+    "verified": "10",
+    "maximum": "10"
  },
  "description": "Rêve de Dragon RPG for FoundryVTT",
  "authors": [
@ -69,10 +69,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/competences.db",
      "type": "Item",
-      "ownership": {
-        "PLAYER": "NONE",
-        "ASSISTANT": "OWNER"
-      },
+      "private": true,
      "flags": {}
    },
    {
@ -81,9 +78,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/arts-et-divertissements.db",
      "type": "Item",
-      "ownership": {
-        "PLAYER": "OBSERVER"
-      },
+      "private": false,
      "flags": {}
    },
    {
@ -92,10 +87,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/competences-creatures.db",
      "type": "Item",
-      "ownership": {
-        "PLAYER": "NONE",
-        "ASSISTANT": "OWNER"
-      },
+      "private": true,
      "flags": {}
    },
    {
@ -104,10 +96,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/competences-entites.db",
      "type": "Item",
-      "ownership": {
-        "PLAYER": "NONE",
-        "ASSISTANT": "OWNER"
-      },
+      "private": true,
      "flags": {}
    },
    {
@ -116,9 +105,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/sorts-oniros.db",
      "type": "Item",
-      "ownership": {
-        "PLAYER": "OBSERVER"
-      },
+      "private": false,
      "flags": {}
    },
    {
@ -127,9 +114,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/sorts-hypnos.db",
      "type": "Item",
-      "ownership": {
-        "PLAYER": "OBSERVER"
-      },
+      "private": false,
      "flags": {}
    },
    {
@ -138,9 +123,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/sorts-narcos.db",
      "type": "Item",
-      "ownership": {
-        "PLAYER": "OBSERVER"
-      },
+      "private": false,
      "flags": {}
    },
    {
@ -149,9 +132,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/sorts-thanatos.db",
      "type": "Item",
-      "ownership": {
-        "PLAYER": "OBSERVER"
-      },
+      "private": false,
      "flags": {}
    },
    {
@ -160,9 +141,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/equipement.db",
      "type": "Item",
-      "ownership": {
-        "PLAYER": "OBSERVER"
-      },
+      "private": false,
      "flags": {}
    },
    {
@ -171,10 +150,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/maladies-et-poisons.db",
      "type": "Item",
-      "ownership": {
-        "PLAYER": "NONE",
-        "ASSISTANT": "OWNER"
-      },
+      "private": true,
      "flags": {}
    },
    {
@ -183,9 +159,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/rappel-des-regles.db",
      "type": "JournalEntry",
-      "ownership": {
-        "PLAYER": "OBSERVER"
-      },
+      "private": false,
      "flags": {}
    },
    {
@ -194,9 +168,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/macros.db",
      "type": "Macro",
-      "ownership": {
-        "PLAYER": "OBSERVER"
-      },
+      "private": false,
      "flags": {}
    },
    {
@ -205,10 +177,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/queues-de-dragon.db",
      "type": "Item",
-      "ownership": {
-        "PLAYER": "NONE",
-        "ASSISTANT": "OWNER"
-      },
+      "private": true,
      "flags": {}
    },
    {
@ -217,10 +186,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/ombres-de-thanatos.db",
      "type": "Item",
-      "ownership": {
-        "PLAYER": "NONE",
-        "ASSISTANT": "OWNER"
-      },
+      "private": true,
      "flags": {}
    },
    {
@ -229,10 +195,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/souffles-de-dragon.db",
      "type": "Item",
-      "ownership": {
-        "PLAYER": "NONE",
-        "ASSISTANT": "OWNER"
-      },
+      "private": true,
      "flags": {}
    },
    {
@ -241,9 +204,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/tarot-draconique.db",
      "type": "Item",
-      "ownership": {
-        "PLAYER": "OBSERVER"
-      },
+      "private": false,
      "flags": {}
    },
    {
@ -252,9 +213,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/extrait-poetique.db",
      "type": "Item",
-      "ownership": {
-        "PLAYER": "OBSERVER"
-      },
+      "private": false,
      "flags": {}
    },
    {
@ -263,10 +222,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/tetes-de-dragon-pour-haut-revants.db",
      "type": "Item",
-      "ownership": {
-        "PLAYER": "NONE",
-        "ASSISTANT": "OWNER"
-      },
+      "private": true,
      "flags": {}
    },
    {
@ -275,10 +231,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/tetes-de-dragon-pour-tous-personnages.db",
      "type": "Item",
-      "ownership": {
-        "PLAYER": "NONE",
-        "ASSISTANT": "OWNER"
-      },
+      "private": true,
      "flags": {}
    },
    {
@ -287,10 +240,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/rencontres.db",
      "type": "Item",
-      "ownership": {
-        "PLAYER": "NONE",
-        "ASSISTANT": "OWNER"
-      },
+      "private": true,
      "flags": {}
    },
    {
@ -299,10 +249,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/tables-diverses.db",
      "type": "RollTable",
-      "ownership": {
-        "PLAYER": "NONE",
-        "ASSISTANT": "OWNER"
-      },
+      "private": true,
      "flags": {}
    },
    {
@ -311,10 +258,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/animaux.db",
      "type": "Actor",
-      "ownership": {
-        "PLAYER": "NONE",
-        "ASSISTANT": "OWNER"
-      },
+      "private": true,
      "flags": {}
    },
    {
@ -323,10 +267,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/voyageurs.db",
      "type": "Actor",
-      "ownership": {
-        "PLAYER": "NONE",
-        "ASSISTANT": "OWNER"
-      },
+      "private": false,
      "flags": {}
    },
    {
@ -335,10 +276,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/vehicules.db",
      "type": "Actor",
-      "ownership": {
-        "PLAYER": "NONE",
-        "ASSISTANT": "OWNER"
-      },
+      "private": true,
      "flags": {}
    },
    {
@ -347,10 +285,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/archetypes.db",
      "type": "Actor",
-      "ownership": {
-        "PLAYER": "NONE",
-        "ASSISTANT": "OWNER"
-      },
+      "private": true,
      "flags": {}
    },
    {
@ -359,10 +294,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/humanoides.db",
      "type": "Actor",
-      "ownership": {
-        "PLAYER": "NONE",
-        "ASSISTANT": "OWNER"
-      },
+      "private": true,
      "flags": {}
    },
    {
@ -371,10 +303,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/entites-de-cauchemar.db",
      "type": "Actor",
-      "ownership": {
-        "PLAYER": "NONE",
-        "ASSISTANT": "OWNER"
-      },
+      "private": true,
      "flags": {}
    },
    {
@ -383,10 +312,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/invocations.db",
      "type": "Actor",
-      "ownership": {
-        "PLAYER": "NONE",
-        "ASSISTANT": "OWNER"
-      },
+      "private": true,
      "flags": {}
    },
    {
@ -395,10 +321,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/faune-flore-mineraux.db",
      "type": "Item",
-      "ownership": {
-        "PLAYER": "NONE",
-        "ASSISTANT": "OWNER"
-      },
+      "private": true,
      "flags": {}
    },
    {
@ -407,10 +330,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/meditations-et-ecrits.db",
      "type": "Item",
-      "ownership": {
-        "PLAYER": "NONE",
-        "ASSISTANT": "OWNER"
-      },
+      "private": true,
      "flags": {}
    },
    {
@ -419,10 +339,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/recettes-alchimiques.db",
      "type": "Item",
-      "ownership": {
-        "PLAYER": "NONE",
-        "ASSISTANT": "OWNER"
-      },
+      "private": true,
      "flags": {}
    },
    {
@ -431,10 +348,7 @@
      "system": "foundryvtt-reve-de-dragon",
      "path": "packs/scenes-rdd.db",
      "type": "Scene",
-      "ownership": {
-        "PLAYER": "NONE",
-        "ASSISTANT": "OWNER"
-      },
+      "private": true,
      "flags": {}
    }
  ],
Author	SHA1	Message	Date
LeRatierBretonnien	49fc2c9b0a	Max release = v10	2023-05-29 13:32:22 +02:00
uberwald	9013376096	Merge pull request 'v10.7.14 - l'expérience de Sémolosse' (#646 ) from VincentVk/foundryvtt-reve-de-dragon:v10 into v10 Reviewed-on: #646	2023-05-29 07:46:20 +02:00
Vincent Vandemeulebrouck	972459a08d	Version 10.7.14	2023-05-28 22:05:36 +02:00
Vincent Vandemeulebrouck	1607629365	Tri des listes d'items	2023-05-28 22:05:09 +02:00
Vincent Vandemeulebrouck	8f7efdad87	Utilisation de la dateReel du calendrier	2023-05-28 22:04:03 +02:00
Vincent Vandemeulebrouck	2dbe0dea4a	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:03:57 +02:00
Vincent Vandemeulebrouck	5fc455fbad	Ajout des acteurs accordés aux entités	2023-05-28 22:01:35 +02:00
uberwald	8a7e4d3a9e	Merge pull request 'Version 10.7.13 - L'armure de Semolosse' (#644 ) from VincentVk/foundryvtt-reve-de-dragon:v10 into v10 Reviewed-on: #644	2023-05-25 20:35:39 +02:00