Max release = v10

Reviewed-on: public/foundryvtt-reve-de-dragon#646

.gitignore

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

changelog.md

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

lang/fr.json

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

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;

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;

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();
   }
 

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;
   }

module/tmr/pixi-tmr.js

@@ -20,20 +20,18 @@ export class PixiTMR {
     this.callbacksOnAnimate = [];
   }
 
-  async load( onLoad = (loader, resources) => {} )  {
+  load( onLoad = (loader, resources) => {} ) {
-    // WIP - Deprecated since v7 : let loader = new PIXI.Loader();
+    let loader = this.pixiApp.loader;
     for (const [name, img] of Object.entries(PixiTMR.textures)) {
-      const texture = await PIXI.Assets.load(img);
+      loader = loader.add(name, img);
-      let image = PIXI.Sprite.from(texture);
     }
-    onLoad();
+    loader.onError.add((error, reason) => { console.log("ERROR", error, reason) });
-    for (let onAnimate of this.callbacksOnAnimate) {
+    loader.load( (loader, resources) =>  {
-      onAnimate();
+      onLoad(loader, resources);
-    }
+      for (let onAnimate of this.callbacksOnAnimate) {
-  }
+        onAnimate();
-
+      }
-  static getImgFromCode(code) {
+    });
-    return PixiTMR.textures[code]
   }
 
   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[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;
@@ -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 ..
+    carteTmr.interactive = true;
-    // This one is deprecated ; 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[code];
-    const texture = PIXI.utils.TextureCache[img];
     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.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));

system.json

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