Table de traductions OK à nouveau

Reviewed-on: #98

.gitignore

@@ -1,6 +1,2 @@
 .history/
 .vscode/
-/packs/*/
-/packs/*/CURRENT
-/packs/*/LOG
-/packs/*/LOCK

README.md

@@ -72,6 +72,7 @@ Pour info, il existe énormément de cas particuliers dans le système de règle
 * compendium/talents ->  LeRatier/Dr.Droide/Moilu/Gharazel
 * various modules and fixes -> Ashburry77
 * various modules and fixes -> Bimkiz
+* contributions au code et améliorations -> Pallando
 
 ## Feedback
 

babele-register.js

@@ -41,7 +41,7 @@ Hooks.once('init', () => {
   }
 
   /*---------------------------------------------------------------------*/
-  game.wfrp4e.entities.ItemWfrp4e.prototype.computeSpellDamage = function (formula, isMagicMissile) {
+  /* DEPRECATED : game.wfrp4e.entities.ItemWfrp4e.prototype.computeSpellDamage = function (formula, isMagicMissile) {
     try {
 
       formula = formula.toLowerCase();
@@ -85,10 +85,10 @@ Hooks.once('init', () => {
     catch (e) {
       throw ui.notifications.error("Error: could not parse spell damage. See console for details")
     }
-  }
+  }*/
 
   /*---------------------------------------------------------------------*/
-  game.wfrp4e.entities.ItemWfrp4e.prototype.computeSpellPrayerFormula = function (type, aoe = false, formulaOverride) {
+  /* DEPRECATED : game.wfrp4e.entities.ItemWfrp4e.prototype.computeSpellPrayerFormula = function (type, aoe = false, formulaOverride) {
     let formula = formulaOverride || this[type]?.value
     if (Number.isNumeric(formula))
       return formula
@@ -134,7 +134,7 @@ Hooks.once('init', () => {
 
     //console.log("calculateSpellAttributes -> " + formula );
     return formula.capitalize();
-  }
+  }*/
 
   /*---------------------------------------------------------------------*/
   // Converters area
@@ -158,29 +158,32 @@ Hooks.once('init', () => {
           for (i = 0; i < len; i++) {
             skills_list[i] = skills_list[i].trim();
             for (let compData of validCompendiums) {
-              let transl = game.babele.translate(compData.metadata.id, { name: skills_list[i] }, true).name;
+              let translItem = game.babele.translate(compData.metadata.id, { name: skills_list[i], type: "skill" }, true)
+              let transl = translItem?.name || undefined
               if (!transl) transl = skills_list[i]
-              //console.log("List ...", skills_list[i]);
+              //console.log("List ...", skills_list[i], compData.metadata.id, translItem);
               if (transl == skills_list[i]) {
                 let res = re.exec(skills_list[i]);
                 if (res) {
                   //console.log("Matched/split:", res[1], res[2]);
                   let subword = game.i18n.localize(res[2].trim());
                   let s1 = res[1].trim() + " ()";
-                  let translw = game.babele.translate(compData.metadata.id, { name: s1 }, true).name;
-                  if (translw != s1) {
+                  translItem = game.babele.translate(compData.metadata.id, { name: s1, type: "skill" }, true)
+                  let translw = translItem?.name || undefined
+                  if (translw && translw != s1) {
                     let res2 = re.exec(translw);
                     transl = res2[1] + "(" + subword + ")";
                   } else {
                     s1 = res[1].trim() + " ( )";
-                    translw = game.babele.translate(compData.metadata.id, { name: s1 }, true).name;
+                    translItem = game.babele.translate(compData.metadata.id, { name: s1, type: "skill" }, true)
+                    translw = translItem?.name || undefined
                     let res2 = re.exec(translw);
                     transl = res2[1] + "(" + subword + ")";
                   }
                 }
               }
               skills_list[i] = transl;
-              if (transl?.system)
+              if (translItem?.system)
                 break;
             }
           }
@@ -242,31 +245,25 @@ Hooks.once('init', () => {
           let re = /(.*)\((.*)\)/i;
           for (i = 0; i < len; i++) {
             for (let compData of validCompendiums) {
-              let transl = game.babele.translate(compData.metadata.id, { name: talents_list[i] }, true).name;
+              //console.log("TALENT - Parsing : ", talents_list)
+              let translItem = game.babele.translate(compData.metadata.id, { name: talents_list[i], type: "talent" }, true);
+              let transl = translItem?.name || undefined
               if (!transl) transl = talents_list[i]
               if (transl == talents_list[i]) {
                 let res = re.exec(talents_list[i]);
                 if (res) {
-                  //console.log("Matched/split:", res[1], res[2]);
                   let subword = game.i18n.localize(res[2].trim());
                   let s1 = res[1].trim(); // No () in talents table
-                  let translw = game.babele.translate(compData.metadata.id, { name: s1 }, true).name;
-                  if (translw != s1) {
+                  translItem = game.babele.translate(compData.metadata.id, { name: s1, type: "talent" }, true)
+                  let translw = translItem?.name || undefined
+                  //console.log("Ssearch talent name:", compData.metadata.id, s1, translw);
+                  if (translw && translw != s1) {
                     transl = translw + " (" + subword + ")";
-                  } else {
-                    s1 = res[1].trim() + " ( )";
-                    translw = game.babele.translate(compData.metadata.id, { name: s1 }, true).name;
-                    let res2 = re.exec(translw);
-                    if (res2) {
-                      transl = res2[1] + " (" + subword + ")";
-                    } else {
-                      transl = translw
-                    }
-                  }
+                  } 
                 }
               }
               talents_list[i] = transl;
-              if (transl?.system)
+              if (translItem?.system)
                 break;
             }
           }
@@ -544,10 +541,11 @@ Hooks.once('init', () => {
         if (value == "Touch") return "Contact"; // Hop !
         if (value == "You") return "Vous"; // Hop !        
         if (value == "Instant") return "Instantané"; // Hop !
-        var translw = value;
-        var re = /(.*) Bonus (\w*)/i;
-        var res = re.exec(value);
-        var unit = "";
+        let translw = value;
+        let re = /(.*) Bonus (\w*)/i;
+        let res = re.exec(value);
+        //console.log("RES1:", res);
+        let unit = "";
         if (res) { // Test "<charac> Bonus <unit>" pattern
           if (res[1]) { // We have char name, then convert it
             translw = "Bonus de " + game.i18n.localize(res[1].trim());
@@ -573,7 +571,12 @@ Hooks.once('init', () => {
         if (unit == "days") unit = "jours";
         if (unit == "yard") unit = "mètre";
         if (unit == "yards") unit = "mètres";
-        translw += " " + unit;
+        if (unit == "Bonus") { // Another weird management
+          translw = "Bonus de " + translw;
+        } else { 
+          translw += " " + unit;
+        }
+        //console.log("Spell duration/range/damage/target :", value, translw);
         return translw;
       }
     });

compendium/wfrp4e-core.trappings.json

@@ -779,7 +779,7 @@
     {
         "description": "<p style=\"text-align: justify;\">Le prix varie en fonction de la fabrication, du type de métal et de la valeur des gemmes. En règle générale, des bagues communes sans gemme coûtent 10 pièces du métal correspondant (par exemple, cuivre, argent ou or) alors que les colliers coûtent 20 pièces du métal correspondant.</p>",
         "effects": [],
-        "id": "Jewellry",
+        "id": "Jewellery",
         "name": "Bijoux"
     },
     {

compendium/wfrp4e-starter-set.tables.json

@@ -0,0 +1,23 @@
+{
+  "label": "Tables (Starter Set)",
+  "mapping": {
+    "results": {
+      "path": "results",
+      "converter": "resultConverter"
+    }
+  },
+  "entries": {
+    "3m4LPj58xoNju80B": {
+      "name": "Blessures Critiques - Tête (Starter Set)"
+    },
+    "BlDLji1LeqHOVj8r": {
+      "name": "Blessures Critiques - Jambe (Starter Set)"
+    },
+    "yYfGtudjckO3bubF": {
+      "name": "Blessures Critiques - Bras (Starter Set)"
+    },
+    "yvzv7xxQuxX7N16b": {
+      "name": "Blessures Critiques - Corps (Starter Set)"
+    }
+  }
+}

compendium/wfrp4e-up-in-arms.tables.json

@@ -0,0 +1,23 @@
+{
+  "label": "Tables (Up In Arms)",
+  "mapping": {
+    "results": {
+      "path": "results",
+      "converter": "resultConverter"
+    }
+  },
+  "entries": {
+    "Head Critical Wounds (Up In Arms)": {
+      "name": "Head Critical Wounds (Up In Arms)"
+    },
+    "Leg Critical Wounds (Up In Arms)": {
+      "name": "Leg Critical Wounds (Up In Arms)"
+    },
+    "Arm Critical Wounds (Up In Arms)": {
+      "name": "Arm Critical Wounds (Up In Arms)"
+    },
+    "Body Critical Wounds (Up In Arms)": {
+      "name": "Body Critical Wounds (Up In Arms)"
+    }
+  }
+}

module.json

@@ -8,7 +8,7 @@
     }
   ],
   "url": "https://www.uberwald.me/gitea/public/foundryvtt-wh4-lang-fr-fr",
-  "version": "7.0.10",
+  "version": "7.0.22",
   "esmodules": [
     "babele-register.js",
     "addon-register.js",
@@ -50,18 +50,6 @@
         "ASSISTANT": "OWNER"
       }
     },
-    {
-      "label": "Sorts FR",
-      "type": "Item",
-      "name": "sort-fr",
-      "path": "packs/sort-fr",
-      "system": "wfrp4e",
-      "flags": {},
-      "ownership": {
-        "PLAYER": "OBSERVER",
-        "ASSISTANT": "OWNER"
-      }
-    },
     {
       "label": "Aides de Jeu FR",
       "type": "JournalEntry",
@@ -75,55 +63,7 @@
       }
     },
     {
-      "label": "Potions : Drogues et Sédatifs",
-      "type": "Item",
-      "name": "drogues-and-sedatifs",
-      "path": "packs/drogues-and-sedatifs",
-      "system": "wfrp4e",
-      "flags": {},
-      "ownership": {
-        "PLAYER": "OBSERVER",
-        "ASSISTANT": "OWNER"
-      }
-    },
-    {
-      "label": "Potions : Pansements et Cataplasmes",
-      "type": "Item",
-      "name": "pansements-and-cataplasmes",
-      "path": "packs/pansements-and-cataplasmes",
-      "system": "wfrp4e",
-      "flags": {},
-      "ownership": {
-        "PLAYER": "OBSERVER",
-        "ASSISTANT": "OWNER"
-      }
-    },
-    {
-      "label": "Potions : Poisons et Toxiques",
-      "type": "Item",
-      "name": "poisons-and-toxiques",
-      "path": "packs/poisons-and-toxiques",
-      "system": "wfrp4e",
-      "flags": {},
-      "ownership": {
-        "PLAYER": "OBSERVER",
-        "ASSISTANT": "OWNER"
-      }
-    },
-    {
-      "label": "Potions : Potions et Décoctions",
-      "type": "Item",
-      "name": "potions-and-decoctions",
-      "path": "packs/potions-and-decoctions",
-      "system": "wfrp4e",
-      "flags": {},
-      "ownership": {
-        "PLAYER": "OBSERVER",
-        "ASSISTANT": "OWNER"
-      }
-    },
-    {
-      "label": "Potions : Antidotes et Remèdes",
+      "label": "Potions",
       "type": "Item",
       "name": "antidotes-and-remedes",
       "path": "packs/antidotes-and-remedes",
@@ -159,11 +99,27 @@
       }
     }
   ],
+  "packFolders": [
+    {
+      "name": "Module WFRP4 FR",
+      "sorting": "m",
+      "color": "#00435c",
+      "packs": [
+        "apothicarium",
+        "tables-des-traductions",
+        "antidotes-and-remedes",
+        "aides-de-jeu-fr",
+        "dons-de-rhya",
+        "plats-dauberges"
+      ],
+      "folders": []
+    }
+  ],
   "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-wh4-lang-fr-fr/raw/v10/module.json",
-  "download": "https://www.uberwald.me/gitea/public/foundryvtt-wh4-lang-fr-fr/archive/foundryvtt-wh4-lang-fr-7.0.10.zip",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-wh4-lang-fr-fr/archive/foundryvtt-wh4-lang-fr-7.0.22.zip",
   "id": "wh4-fr-translation",
   "compatibility": {
-    "minimum": "10",
+    "minimum": "11",
     "verified": "11"
   },
   "relationships": {
@@ -182,4 +138,4 @@
       }
     ]
   }
-}
+}

modules/config-patch.js

@@ -176,6 +176,22 @@ export class WH4FRPatchConfig {
         game.wfrp4e.config.species["welf"] = "Elfe Sylvain";
       }
 
+      if (game.wfrp4e.config.charastericticsBonus) {
+        game.wfrp4e.config.charastericticsBonus = 
+          {
+            "ws": "Bonus de Capacité de Combat",
+            "bs": "Bonus de Capacité de Tir",
+            "s": "Bonus de Force",
+            "t": "Bonus d'Endurance",
+            "i": "Bonus d'Initiative",
+            "ag": "Bonus d'Agilité",
+            "dex": "Bonus de Dexterité",
+            "int": "Bonus d'Intelligence",
+            "wp": "Bonus de Force Mentale",
+            "fel": "Bonus de Sociabilité"
+        }
+      }
+
       if (game.wfrp4e.config.classTrappings) {
         for(const c of Object.keys(game.wfrp4e.config.classTrappings)) {
           game.wfrp4e.config.classTrappings[game.i18n.localize(c)] = game.wfrp4e.config.classTrappings[c];

modules/import-stat-2.js

@@ -52,13 +52,13 @@ import "./xregexp-all.js";
 const us_carac = 'm\\s+ws\\s+bs\\s+s\\s+t\\s+i\\s+agi?\\s+dex\\s+int\\s+\\wp\\s+fel\\s+w';
 const fr_carac = 'm\\s+cc\\s+ct\\s+f\\s+e\\s+i\\s+agi?\\s+dex\\s+int\\s+fm\\s+soc\\s+b';
 const carac_val = '(?<m>[0-9\\-]+)\\s+(?<ws>[0-9\\-]+)\\s+(?<bs>[0-9\\-]+)\\s+(?<s>[0-9\\-]+)\\s+(?<t>[0-9\\-]+)\\s+(?<i>[0-9\\-]+)\\s+(?<ag>[0-9\\-]+)\\s+(?<dex>[0-9\\-]+)\\s+(?<int>[0-9\\-]+)\\s+(?<wp>[0-9\\-]+)\\s+(?<fel>[0-9\\-]+)\\s+(?<w>[0-9\\-\*]+)';
-const name_val = '(?<name>[a-zA-Z\\s\\-,]*)[\\s\\r\\na-zA-Z]*(?<tiers>.*|[\\(\\)a-z0-9]+)';
+const name_val = '(?<name>[a-zA-Z\\s\\-,\']*)[\\s\\r\\na-zA-Z]*(?<tiers>.*|[\\(\\)a-z0-9]+)';
 let sectionDataFR = [
   { name: "trait", toFind: "Traits\\s*:", secondParse: '(?<name>[a-zöàéè\\s]*)[\\s\\+]*(?<value>.*|[\\+0-9]+)', index: -1 },
   { name: "skill", toFind: "Compétences\\s*:", secondParse: '(?<name>[a-zàéè\\s\\(\\)]*)[\\s\\+]*(?<value>.*|[0-9]+)', index: -1 },
-  { name: "talent", toFind: "Talents\\s*:", secondParse: '(?<name>[a-zöàéè\\-\\(\\)\\s\\/\'’]*)[\\s\\+]*(?<value>.*|[0-9]+)', index: -1 },
+  { name: "talent", toFind: "Talents\\s*:", secondParse: '(?<name>[a-zöàéè\\-\\!\\(\\)\\s\\/\'’]*)[\\s\\+]*(?<value>.*|[0-9]+)', index: -1 },
   { name: "mutation", toFind: "Mutations\\s*:", secondParse: '(?<name>[a-zöàéè\\s]*)[\\s\\+]*(?<value>.*|[0-9]+)', index: -1 },
-  { name: "trapping", toFind: "Equipement\\s*:", secondParse: '(?<name>[a-zöàéè0-9\\s]*)[\\s\\+]*(?<value>.*|[0-9]+)', index: -1 },
+  { name: "trapping", toFind: "Equipement\\s*:", secondParse: '(?<name>[a-zöàéè0-9\\s(\\)\\-]*)[\\s\\+]*(?<value>.*|[0-9]+)', index: -1 },
   { name: "spell", toFind: "Sorts\\s*\\([a-z\\s]*\\)*:", secondParse: '(?<name>[a-zöàéè\\s]*)', index: -1 },
   { name: "spellpetty", toFind: "Spells\\s*\\(Magie Mineure\\)*:", secondParse: '(?<name>[a-zö\\-\\s]*)', index: -1 },
   { name: "spellarcane", toFind: "Spells\\s*\\(Arcane[a-z\\s]*\\)*:", secondParse: '(?<name>[a-zö\\-\\s]*)', index: -1 },
@@ -67,13 +67,17 @@ let sectionDataFR = [
 let sectionDataUS = [
   { name: "trait", toFind: "Traits\\s*:", secondParse: '(?<name>[a-z\\s]*)[\\s\\+]*(?<value>.*|[\\+0-9]+)', index: -1 },
   { name: "skill", toFind: "Skills\\s*:", secondParse: '(?<name>[a-z\\s\\(\\)]*)[\\s\\+]*(?<value>.*|[0-9]+)', index: -1 },
-  { name: "talent", toFind: "Talents\\s*:", secondParse: '(?<name>[a-z\\-\\s\\(\\)\\/\'’]*)[\\s\\+]*(?<value>.*|[0-9]+)', index: -1 },
+  { name: "talent", toFind: "Talents\\s*:", secondParse: '(?<name>[a-z\\-\\s\\!\\(\\)\\/\'’]*)[\\s\\+]*(?<value>.*|[0-9]+)', index: -1 },
   { name: "mutation", toFind: "Mutations\\s*:", secondParse: '(?<name>[a-zö\\s]*)[\\s\\+]*(?<value>.*|[0-9]+)', index: -1 },
-  { name: "trapping", toFind: "Trappings\\s*:", secondParse: '(?<name>[a-zö0-9\\s]*)[\\s\\+]*(?<value>.*|[0-9]+)', index: -1 },
+  { name: "trapping", toFind: "Trappings\\s*:", secondParse: '(?<name>[a-zö0-9\\s\\(\\)\\-]*)[\\s\\+]*(?<value>.*|[0-9]+)', index: -1 },
   { name: "spellpetty", toFind: "Spells\\s*\\(Petty\\s*[a-z\\s]*\\)*:", secondParse: '(?<name>[a-zö\\-\\s]*)', index: -1 },
   { name: "spellarcane", toFind: "Spells\\s*\\(Arcane\\s*[a-z\\s]*\\)*:", secondParse: '(?<name>[a-zö\\-\\s]*)', index: -1 },
   { name: "spelllore", toFind: "Spells\\s*\\(Lore\\s*of\\s*(?<lore>[a-z\\s]*)\\)*:", secondParse: '(?<name>[a-zö\\-\\s]*)', index: -1 }
 ]
+let moneyUS = [ {name:" gold crown", key: "gc"}, {name: " gc", key: "gc"}, 
+                {name:" silver shilling", key:"ss"}, {name:" ss", key: "ss"}, {name:"/-", key: "ss"}, {name:" brass penn", key: "bp"}, {name:" bp", key: "bp"} ]
+let moneyFR = [ {name:" couronnes d", key: "gc"}, {name: " co", key: "gc"}, 
+                {name:" pistoles ", key:"ss"}, {name:" pa", key: "ss"}, {name:"/-", key: "ss"}, {name:" sous de cuivre", key: "bp"}, {name:" sc", key: "bp"} ]
 let regSep = XRegExp('\\s*,\\s*', 'gi'); // Term separator, with auto trim
 let regLine1 = XRegExp('[\\r\\n\\.]', 'gi'); // Term separator, with auto trim
 let regName = XRegExp(name_val, 'gi');
@@ -178,7 +182,7 @@ async function __findSkill(skillName, value = undefined) {
 
 /************************************************************************************/
 async function __findTalent(talentName) {
-  let parseStr = '(?<name>[a-z\\s\\/\']*)[\\s\\+]*(?<specialized>[a-z\\s\\(\\)\'’]*)';
+  let parseStr = '(?<name>[a-z\\s\\!\\/\']*)[\\s\\+]*(?<specialized>[a-z\\s\\(\\)\'’]*)';
   let talentSplit = XRegExp.exec(talentName, XRegExp(parseStr, 'gi'));
   let toSearch = talentSplit.name.toLowerCase().trim();
 
@@ -246,16 +250,19 @@ export default async function statParserFR(statString, type = "npc") {
 
   // Patch wront/strange carac value before processing
   statString = statString.replace(/ –/g, " 0")
+  let moneys = { gc: 0, ss: 0, bp: 0 }
 
   let statNameReg = us_carac
-  let sectionData = sectionDataUS
+  let sectionData = duplicate(sectionDataUS)
   let skillGrouping = __SkillGroupsUS
+  let moneyLang = moneyUS
   // Detect French stat block 
   if (statString.includes('CC') && statString.includes('CT') && statString.includes('FM')) {
     //ui.notifications.warn("Le parsing de stablock en Français n'est pas encore prêt")
     statNameReg = fr_carac
-    sectionData = sectionDataFR
+    sectionData = duplicate(sectionDataFR)
     skillGrouping = __SkillGroupsFR
+    moneyLang = moneyFR
   }
 
   let reg1 = XRegExp(statNameReg, 'gi')
@@ -368,7 +375,7 @@ export default async function statParserFR(statString, type = "npc") {
               } else {
                 itemFound.system.specification.value = game.i18n.localize(value)
               }
-              itemFound.name += "(" + value + ")"
+              //itemFound.name += "(" + value + ")"
             }
             if (!itemFound)
               ui.notifications.error("Trait non trouvé, à ajouter manuellement : " + name, { permanent: true })
@@ -405,6 +412,7 @@ export default async function statParserFR(statString, type = "npc") {
             if (!itemFound) {
               ui.notifications.error("Talent non trouvé, à ajouter manuellement : " + name, { permanent: true })
             }
+          
           } else if (def.name == 'trapping') {
             itemFound = await __findItem(name, "trapping");
             if (!itemFound) {
@@ -415,7 +423,7 @@ export default async function statParserFR(statString, type = "npc") {
             }
             if (!itemFound && name) {
               if (name.toLowerCase().includes("armor") || name.toLowerCase().includes("armure") || name.toLowerCase().includes("armour")) {
-                itemFound = new ItemWfrp4e({ img: "systems/wfrp4e/icons/blank.png", name: name, type: "armor", system: game.system.model.Item.armor })
+                itemFound = new ItemWfrp4e({ img: "systems/wfrp4e/icons/blank.png", name: name, type: "armour", system: game.system.model.Item.armor })
               } else if (name.toLowerCase().includes("weapon") || name.toLowerCase().includes("arme")) {
                 itemFound = new ItemWfrp4e({ img: "systems/wfrp4e/icons/blank.png", name: name, type: "weapon", system: game.system.model.Item.weapon })
               } else {
@@ -427,13 +435,22 @@ export default async function statParserFR(statString, type = "npc") {
               }
               itemFound = itemFound.toObject()
             }
+            // Searching money stuff
+            for (let mondeyDef of moneyLang) {
+              if (name.toLowerCase().includes(mondeyDef.name)) {
+                let regMoney = XRegExp("(\\d+)\\s*" + mondeyDef.name.trim(), 'gi')
+                let moneyParsed = XRegExp.exec(name.toLowerCase(), regMoney)
+                console.log("Parsing money", name, moneyParsed)
+                moneys[mondeyDef.key] += (moneyParsed && moneyParsed[1]) ? Number(moneyParsed[1]) : 0
+              }
+            }
           } else if (def.name.includes('spell')) {
             console.log("Found spells section!!!!", name, def, def.lore || "NO LORE")
             // Lore management, firs pass
-            if ( def.lore ) {
+            if (def.lore) {
               let newName = name + " (" + def.lore + ")"
               itemFound = await __findItem(newName, "spell");
-              console.log("Trying to find ", newName, itemFound)
+              //console.log("Trying to find ", newName, itemFound)
             }
             if (!itemFound) { // If not found with Lore, try without the lore
               itemFound = await __findItem(name, "spell");
@@ -455,14 +472,39 @@ export default async function statParserFR(statString, type = "npc") {
     }
     let moneyItems = await game.wfrp4e.utility.allMoneyItems() || [];
     moneyItems = moneyItems.sort((a, b) => (a.system.coinValue.value > b.system.coinValue.value) ? -1 : 1);
-    moneyItems.forEach(m => m.system.quantity.value = 0)
+    for (let m of moneyItems) {
+      m.system.quantity.value = 0
+      if (m.system.coinValue.value == 1) {
+        m.system.quantity.value += moneys.bp
+      }
+      if (m.system.coinValue.value == 240) {
+        m.system.quantity.value += moneys.gc
+      }
+      if (m.system.coinValue.value == 12) {
+        m.system.quantity.value += moneys.ss
+      }
+    }
     globalItemList = globalItemList.concat(moneyItems);
-    //console.log("My liste :", globalItemList);
+    //DEBUG : console.log("My liste :", moneyItems, moneys);
     let name = pnjName;
 
     let effects = globalItemList.reduce((total, globItem) => total.concat(globItem.effects), [])
     effects = effects.filter(e => !!e)
     effects = effects.filter(e => e.transfer)
+    for (let e of effects) {
+      for (let c of e.changes) {
+        // Charac management stuff
+        if (c.key?.includes("characteristics")) {
+          let cKey = c.key.split(".")[2]
+          model.characteristics[cKey].initial -= Number(c.value)
+        }
+        // Move management
+        if (c.key?.includes("move")) {
+          model.details.move.value -= Number(c.value)
+        }
+      }
+    }
+    //DEBUG : console.log("EFFECTS", effects)
 
     return { name, type, data: model, items: globalItemList, effects }
   }

packs/aides-de-jeu-fr/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000359

packs/aides-de-jeu-fr/LOG

@@ -0,0 +1,7 @@
+2023/11/15-17:42:16.143060 7fedf37fe6c0 Recovering log #357
+2023/11/15-17:42:16.175280 7fedf37fe6c0 Delete type=3 #355
+2023/11/15-17:42:16.175329 7fedf37fe6c0 Delete type=0 #357
+2023/11/15-17:42:45.255642 7feb713c96c0 Level-0 table #362: started
+2023/11/15-17:42:45.255700 7feb713c96c0 Level-0 table #362: 0 bytes OK
+2023/11/15-17:42:45.262284 7feb713c96c0 Delete type=0 #360
+2023/11/15-17:42:45.287250 7feb713c96c0 Manual compaction at level-0 from '!journal!3IgmiprzLB6Lwenc' @ 72057594037927935 : 1 .. '!journal!suuYN87Al1ZZWtQQ' @ 0 : 0; will stop at (end)

packs/aides-de-jeu-fr/LOG.old

@@ -0,0 +1,7 @@
+2023/11/15-17:41:29.489267 7fee08df96c0 Recovering log #353
+2023/11/15-17:41:29.499370 7fee08df96c0 Delete type=3 #351
+2023/11/15-17:41:29.499459 7fee08df96c0 Delete type=0 #353
+2023/11/15-17:41:59.426003 7feb713c96c0 Level-0 table #358: started
+2023/11/15-17:41:59.426035 7feb713c96c0 Level-0 table #358: 0 bytes OK
+2023/11/15-17:41:59.432389 7feb713c96c0 Delete type=0 #356
+2023/11/15-17:41:59.446866 7feb713c96c0 Manual compaction at level-0 from '!journal!3IgmiprzLB6Lwenc' @ 72057594037927935 : 1 .. '!journal!suuYN87Al1ZZWtQQ' @ 0 : 0; will stop at (end)

packs/antidotes-and-remedes/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000360

packs/antidotes-and-remedes/LOG

@@ -0,0 +1,7 @@
+2023/11/15-17:42:16.177674 7fee095fa6c0 Recovering log #358
+2023/11/15-17:42:16.210044 7fee095fa6c0 Delete type=3 #356
+2023/11/15-17:42:16.210161 7fee095fa6c0 Delete type=0 #358
+2023/11/15-17:42:45.262422 7feb713c96c0 Level-0 table #363: started
+2023/11/15-17:42:45.262451 7feb713c96c0 Level-0 table #363: 0 bytes OK
+2023/11/15-17:42:45.268977 7feb713c96c0 Delete type=0 #361
+2023/11/15-17:42:45.287278 7feb713c96c0 Manual compaction at level-0 from '!folders!3uquYH73ttCdoH0I' @ 72057594037927935 : 1 .. '!items!ylFhk7mGZOnAJTUT' @ 0 : 0; will stop at (end)

packs/antidotes-and-remedes/LOG.old

@@ -0,0 +1,7 @@
+2023/11/15-17:41:29.501814 7fee095fa6c0 Recovering log #354
+2023/11/15-17:41:29.511651 7fee095fa6c0 Delete type=3 #352
+2023/11/15-17:41:29.511705 7fee095fa6c0 Delete type=0 #354
+2023/11/15-17:41:59.410822 7feb713c96c0 Level-0 table #359: started
+2023/11/15-17:41:59.410872 7feb713c96c0 Level-0 table #359: 0 bytes OK
+2023/11/15-17:41:59.417451 7feb713c96c0 Delete type=0 #357
+2023/11/15-17:41:59.425867 7feb713c96c0 Manual compaction at level-0 from '!folders!3uquYH73ttCdoH0I' @ 72057594037927935 : 1 .. '!items!ylFhk7mGZOnAJTUT' @ 0 : 0; will stop at (end)

packs/apothicarium/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000359

packs/apothicarium/LOG

@@ -0,0 +1,7 @@
+2023/11/15-17:42:16.308041 7fedf37fe6c0 Recovering log #357
+2023/11/15-17:42:16.334001 7fedf37fe6c0 Delete type=3 #355
+2023/11/15-17:42:16.334121 7fedf37fe6c0 Delete type=0 #357
+2023/11/15-17:42:45.287466 7feb713c96c0 Level-0 table #362: started
+2023/11/15-17:42:45.287530 7feb713c96c0 Level-0 table #362: 0 bytes OK
+2023/11/15-17:42:45.293998 7feb713c96c0 Delete type=0 #360
+2023/11/15-17:42:45.294197 7feb713c96c0 Manual compaction at level-0 from '!journal!cZtNgayIw2QFhC9u' @ 72057594037927935 : 1 .. '!journal!cZtNgayIw2QFhC9u' @ 0 : 0; will stop at (end)

packs/apothicarium/LOG.old

@@ -0,0 +1,7 @@
+2023/11/15-17:41:29.527190 7fedf3fff6c0 Recovering log #353
+2023/11/15-17:41:29.536787 7fedf3fff6c0 Delete type=3 #351
+2023/11/15-17:41:29.536837 7fedf3fff6c0 Delete type=0 #353
+2023/11/15-17:41:59.440723 7feb713c96c0 Level-0 table #358: started
+2023/11/15-17:41:59.440745 7feb713c96c0 Level-0 table #358: 0 bytes OK
+2023/11/15-17:41:59.446765 7feb713c96c0 Delete type=0 #356
+2023/11/15-17:41:59.446886 7feb713c96c0 Manual compaction at level-0 from '!journal!cZtNgayIw2QFhC9u' @ 72057594037927935 : 1 .. '!journal!cZtNgayIw2QFhC9u' @ 0 : 0; will stop at (end)

packs/dons-de-rhya/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000359

packs/dons-de-rhya/LOG

@@ -0,0 +1,7 @@
+2023/11/15-17:42:16.111319 7fedf3fff6c0 Recovering log #357
+2023/11/15-17:42:16.141307 7fedf3fff6c0 Delete type=3 #355
+2023/11/15-17:42:16.141358 7fedf3fff6c0 Delete type=0 #357
+2023/11/15-17:42:45.269172 7feb713c96c0 Level-0 table #362: started
+2023/11/15-17:42:45.269251 7feb713c96c0 Level-0 table #362: 0 bytes OK
+2023/11/15-17:42:45.275774 7feb713c96c0 Delete type=0 #360
+2023/11/15-17:42:45.287295 7feb713c96c0 Manual compaction at level-0 from '!journal!50u8VAjdmovyr0hx' @ 72057594037927935 : 1 .. '!journal!yzw9I0r3hCK7PJnz' @ 0 : 0; will stop at (end)

packs/dons-de-rhya/LOG.old

@@ -0,0 +1,7 @@
+2023/11/15-17:41:29.475001 7fedf3fff6c0 Recovering log #353
+2023/11/15-17:41:29.485837 7fedf3fff6c0 Delete type=3 #351
+2023/11/15-17:41:29.485890 7fedf3fff6c0 Delete type=0 #353
+2023/11/15-17:41:59.403681 7feb713c96c0 Level-0 table #358: started
+2023/11/15-17:41:59.403727 7feb713c96c0 Level-0 table #358: 0 bytes OK
+2023/11/15-17:41:59.410630 7feb713c96c0 Delete type=0 #356
+2023/11/15-17:41:59.425858 7feb713c96c0 Manual compaction at level-0 from '!journal!50u8VAjdmovyr0hx' @ 72057594037927935 : 1 .. '!journal!yzw9I0r3hCK7PJnz' @ 0 : 0; will stop at (end)

packs/drogues-and-sedatifs/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000268

packs/drogues-and-sedatifs/LOG

@@ -0,0 +1,8 @@
+2023/10/01-20:44:40.570183 7f5807fff6c0 Recovering log #266
+2023/10/01-20:44:40.632484 7f5807fff6c0 Delete type=3 #264
+2023/10/01-20:44:40.632822 7f5807fff6c0 Delete type=0 #266
+2023/10/01-20:59:02.099129 7f58067fc6c0 Level-0 table #271: started
+2023/10/01-20:59:02.099170 7f58067fc6c0 Level-0 table #271: 0 bytes OK
+2023/10/01-20:59:02.106069 7f58067fc6c0 Delete type=0 #269
+2023/10/01-20:59:02.112689 7f58067fc6c0 Manual compaction at level-0 from '!items!0LoyZMCXQNdFa2eX' @ 72057594037927935 : 1 .. '!items!ylFhk7mGZOnAJTUT' @ 0 : 0; will stop at (end)
+2023/10/01-20:59:02.112752 7f58067fc6c0 Manual compaction at level-1 from '!items!0LoyZMCXQNdFa2eX' @ 72057594037927935 : 1 .. '!items!ylFhk7mGZOnAJTUT' @ 0 : 0; will stop at (end)

packs/drogues-and-sedatifs/LOG.old

@@ -0,0 +1,8 @@
+2023/10/01-18:43:22.727478 7f5807fff6c0 Recovering log #262
+2023/10/01-18:43:22.785389 7f5807fff6c0 Delete type=3 #260
+2023/10/01-18:43:22.785534 7f5807fff6c0 Delete type=0 #262
+2023/10/01-18:47:48.446951 7f58067fc6c0 Level-0 table #267: started
+2023/10/01-18:47:48.447052 7f58067fc6c0 Level-0 table #267: 0 bytes OK
+2023/10/01-18:47:48.485936 7f58067fc6c0 Delete type=0 #265
+2023/10/01-18:47:48.524251 7f58067fc6c0 Manual compaction at level-0 from '!items!0LoyZMCXQNdFa2eX' @ 72057594037927935 : 1 .. '!items!ylFhk7mGZOnAJTUT' @ 0 : 0; will stop at (end)
+2023/10/01-18:47:48.524330 7f58067fc6c0 Manual compaction at level-1 from '!items!0LoyZMCXQNdFa2eX' @ 72057594037927935 : 1 .. '!items!ylFhk7mGZOnAJTUT' @ 0 : 0; will stop at (end)

packs/pansements-and-cataplasmes/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000268

packs/pansements-and-cataplasmes/LOG

@@ -0,0 +1,8 @@
+2023/10/01-20:44:40.636180 7f5a9cdff6c0 Recovering log #266
+2023/10/01-20:44:40.697598 7f5a9cdff6c0 Delete type=3 #264
+2023/10/01-20:44:40.697748 7f5a9cdff6c0 Delete type=0 #266
+2023/10/01-20:59:02.084751 7f58067fc6c0 Level-0 table #271: started
+2023/10/01-20:59:02.084857 7f58067fc6c0 Level-0 table #271: 0 bytes OK
+2023/10/01-20:59:02.091434 7f58067fc6c0 Delete type=0 #269
+2023/10/01-20:59:02.112649 7f58067fc6c0 Manual compaction at level-0 from '!items!25lWFfePrPzoL9qs' @ 72057594037927935 : 1 .. '!items!t9Z8fy9D9bcgBzj0' @ 0 : 0; will stop at (end)
+2023/10/01-20:59:02.112721 7f58067fc6c0 Manual compaction at level-1 from '!items!25lWFfePrPzoL9qs' @ 72057594037927935 : 1 .. '!items!t9Z8fy9D9bcgBzj0' @ 0 : 0; will stop at (end)

packs/pansements-and-cataplasmes/LOG.old

@@ -0,0 +1,8 @@
+2023/10/01-18:43:22.793152 7f5806ffd6c0 Recovering log #262
+2023/10/01-18:43:22.857219 7f5806ffd6c0 Delete type=3 #260
+2023/10/01-18:43:22.857359 7f5806ffd6c0 Delete type=0 #262
+2023/10/01-18:47:48.340716 7f58067fc6c0 Level-0 table #267: started
+2023/10/01-18:47:48.340770 7f58067fc6c0 Level-0 table #267: 0 bytes OK
+2023/10/01-18:47:48.376145 7f58067fc6c0 Delete type=0 #265
+2023/10/01-18:47:48.376399 7f58067fc6c0 Manual compaction at level-0 from '!items!25lWFfePrPzoL9qs' @ 72057594037927935 : 1 .. '!items!t9Z8fy9D9bcgBzj0' @ 0 : 0; will stop at (end)
+2023/10/01-18:47:48.376460 7f58067fc6c0 Manual compaction at level-1 from '!items!25lWFfePrPzoL9qs' @ 72057594037927935 : 1 .. '!items!t9Z8fy9D9bcgBzj0' @ 0 : 0; will stop at (end)

packs/plats-dauberges/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000359

packs/plats-dauberges/LOG

@@ -0,0 +1,7 @@
+2023/11/15-17:42:16.080813 7fee08df96c0 Recovering log #357
+2023/11/15-17:42:16.108691 7fee08df96c0 Delete type=3 #355
+2023/11/15-17:42:16.108769 7fee08df96c0 Delete type=0 #357
+2023/11/15-17:42:45.247895 7feb713c96c0 Level-0 table #362: started
+2023/11/15-17:42:45.247927 7feb713c96c0 Level-0 table #362: 0 bytes OK
+2023/11/15-17:42:45.255226 7feb713c96c0 Delete type=0 #360
+2023/11/15-17:42:45.255421 7feb713c96c0 Manual compaction at level-0 from '!tables!4l60Lxv8cpsyy2Cg' @ 72057594037927935 : 1 .. '!tables.results!tfaYKDZqu7kgZvRG.yvbwKursaixh2dby' @ 0 : 0; will stop at (end)

packs/plats-dauberges/LOG.old

@@ -0,0 +1,7 @@
+2023/11/15-17:41:29.460484 7fedf37fe6c0 Recovering log #353
+2023/11/15-17:41:29.471536 7fedf37fe6c0 Delete type=3 #351
+2023/11/15-17:41:29.471666 7fedf37fe6c0 Delete type=0 #353
+2023/11/15-17:41:59.417645 7feb713c96c0 Level-0 table #358: started
+2023/11/15-17:41:59.417700 7feb713c96c0 Level-0 table #358: 0 bytes OK
+2023/11/15-17:41:59.425759 7feb713c96c0 Delete type=0 #356
+2023/11/15-17:41:59.425889 7feb713c96c0 Manual compaction at level-0 from '!tables!4l60Lxv8cpsyy2Cg' @ 72057594037927935 : 1 .. '!tables.results!tfaYKDZqu7kgZvRG.yvbwKursaixh2dby' @ 0 : 0; will stop at (end)

packs/poisons-and-toxiques/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000268

packs/poisons-and-toxiques/LOG

@@ -0,0 +1,8 @@
+2023/10/01-20:44:40.701549 7f5806ffd6c0 Recovering log #266
+2023/10/01-20:44:40.764544 7f5806ffd6c0 Delete type=3 #264
+2023/10/01-20:44:40.764684 7f5806ffd6c0 Delete type=0 #266
+2023/10/01-20:59:02.106210 7f58067fc6c0 Level-0 table #271: started
+2023/10/01-20:59:02.106249 7f58067fc6c0 Level-0 table #271: 0 bytes OK
+2023/10/01-20:59:02.112490 7f58067fc6c0 Delete type=0 #269
+2023/10/01-20:59:02.112706 7f58067fc6c0 Manual compaction at level-0 from '!items!7NSF4hTW0QUkYCnZ' @ 72057594037927935 : 1 .. '!items!xobXk8u7SVQ49eP8' @ 0 : 0; will stop at (end)
+2023/10/01-20:59:02.112767 7f58067fc6c0 Manual compaction at level-1 from '!items!7NSF4hTW0QUkYCnZ' @ 72057594037927935 : 1 .. '!items!xobXk8u7SVQ49eP8' @ 0 : 0; will stop at (end)

packs/poisons-and-toxiques/LOG.old

@@ -0,0 +1,8 @@
+2023/10/01-18:43:22.865435 7f58077fe6c0 Recovering log #262
+2023/10/01-18:43:22.924289 7f58077fe6c0 Delete type=3 #260
+2023/10/01-18:43:22.924448 7f58077fe6c0 Delete type=0 #262
+2023/10/01-18:47:48.407565 7f58067fc6c0 Level-0 table #267: started
+2023/10/01-18:47:48.407608 7f58067fc6c0 Level-0 table #267: 0 bytes OK
+2023/10/01-18:47:48.446683 7f58067fc6c0 Delete type=0 #265
+2023/10/01-18:47:48.524233 7f58067fc6c0 Manual compaction at level-0 from '!items!7NSF4hTW0QUkYCnZ' @ 72057594037927935 : 1 .. '!items!xobXk8u7SVQ49eP8' @ 0 : 0; will stop at (end)
+2023/10/01-18:47:48.524299 7f58067fc6c0 Manual compaction at level-1 from '!items!7NSF4hTW0QUkYCnZ' @ 72057594037927935 : 1 .. '!items!xobXk8u7SVQ49eP8' @ 0 : 0; will stop at (end)

packs/potions-and-decoctions/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000268

packs/potions-and-decoctions/LOG

@@ -0,0 +1,8 @@
+2023/10/01-20:44:40.768234 7f58077fe6c0 Recovering log #266
+2023/10/01-20:44:40.821657 7f58077fe6c0 Delete type=3 #264
+2023/10/01-20:44:40.821800 7f58077fe6c0 Delete type=0 #266
+2023/10/01-20:59:02.112885 7f58067fc6c0 Level-0 table #271: started
+2023/10/01-20:59:02.112924 7f58067fc6c0 Level-0 table #271: 0 bytes OK
+2023/10/01-20:59:02.119967 7f58067fc6c0 Delete type=0 #269
+2023/10/01-20:59:02.147587 7f58067fc6c0 Manual compaction at level-0 from '!items!0iQg3XJmxAAbFief' @ 72057594037927935 : 1 .. '!items!uwcMzO6u0rnhqLdf' @ 0 : 0; will stop at (end)
+2023/10/01-20:59:02.147752 7f58067fc6c0 Manual compaction at level-1 from '!items!0iQg3XJmxAAbFief' @ 72057594037927935 : 1 .. '!items!uwcMzO6u0rnhqLdf' @ 0 : 0; will stop at (end)

packs/potions-and-decoctions/LOG.old

@@ -0,0 +1,8 @@
+2023/10/01-18:43:22.932395 7f5a9cdff6c0 Recovering log #262
+2023/10/01-18:43:22.998115 7f5a9cdff6c0 Delete type=3 #260
+2023/10/01-18:43:22.998245 7f5a9cdff6c0 Delete type=0 #262
+2023/10/01-18:47:48.376668 7f58067fc6c0 Level-0 table #267: started
+2023/10/01-18:47:48.376711 7f58067fc6c0 Level-0 table #267: 0 bytes OK
+2023/10/01-18:47:48.407379 7f58067fc6c0 Delete type=0 #265
+2023/10/01-18:47:48.524212 7f58067fc6c0 Manual compaction at level-0 from '!items!0iQg3XJmxAAbFief' @ 72057594037927935 : 1 .. '!items!uwcMzO6u0rnhqLdf' @ 0 : 0; will stop at (end)
+2023/10/01-18:47:48.524283 7f58067fc6c0 Manual compaction at level-1 from '!items!0iQg3XJmxAAbFief' @ 72057594037927935 : 1 .. '!items!uwcMzO6u0rnhqLdf' @ 0 : 0; will stop at (end)

packs/sort-fr/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000272

packs/sort-fr/LOG

@@ -0,0 +1,8 @@
+2023/10/01-20:59:53.930690 7f5a9cdff6c0 Recovering log #270
+2023/10/01-20:59:53.941737 7f5a9cdff6c0 Delete type=3 #268
+2023/10/01-20:59:53.942093 7f5a9cdff6c0 Delete type=0 #270
+2023/10/01-21:01:43.214418 7f58067fc6c0 Level-0 table #275: started
+2023/10/01-21:01:43.214458 7f58067fc6c0 Level-0 table #275: 0 bytes OK
+2023/10/01-21:01:43.221508 7f58067fc6c0 Delete type=0 #273
+2023/10/01-21:01:43.236081 7f58067fc6c0 Manual compaction at level-0 from '!items!2NuLGbLlyHPck2Je' @ 72057594037927935 : 1 .. '!items.effects!VexogjUDXdGAHWmN.kNTwaivtonPJpdY6' @ 0 : 0; will stop at (end)
+2023/10/01-21:01:43.236146 7f58067fc6c0 Manual compaction at level-1 from '!items!2NuLGbLlyHPck2Je' @ 72057594037927935 : 1 .. '!items.effects!VexogjUDXdGAHWmN.kNTwaivtonPJpdY6' @ 0 : 0; will stop at (end)

packs/sort-fr/LOG.old

@@ -0,0 +1,8 @@
+2023/10/01-20:44:40.439485 7f58077fe6c0 Recovering log #266
+2023/10/01-20:44:40.500106 7f58077fe6c0 Delete type=3 #264
+2023/10/01-20:44:40.500261 7f58077fe6c0 Delete type=0 #266
+2023/10/01-20:59:02.063156 7f58067fc6c0 Level-0 table #271: started
+2023/10/01-20:59:02.063229 7f58067fc6c0 Level-0 table #271: 0 bytes OK
+2023/10/01-20:59:02.069747 7f58067fc6c0 Delete type=0 #269
+2023/10/01-20:59:02.084232 7f58067fc6c0 Manual compaction at level-0 from '!items!2NuLGbLlyHPck2Je' @ 72057594037927935 : 1 .. '!items.effects!VexogjUDXdGAHWmN.kNTwaivtonPJpdY6' @ 0 : 0; will stop at (end)
+2023/10/01-20:59:02.084332 7f58067fc6c0 Manual compaction at level-1 from '!items!2NuLGbLlyHPck2Je' @ 72057594037927935 : 1 .. '!items.effects!VexogjUDXdGAHWmN.kNTwaivtonPJpdY6' @ 0 : 0; will stop at (end)

packs/tables-des-traductions/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000002

packs/tables-des-traductions/LOG

@@ -0,0 +1,5 @@
+2023/11/15-17:42:16.246765 7fee08df96c0 Delete type=3 #1
+2023/11/15-17:42:45.275880 7feb713c96c0 Level-0 table #5: started
+2023/11/15-17:42:45.279591 7feb713c96c0 Level-0 table #5: 64121 bytes OK
+2023/11/15-17:42:45.286793 7feb713c96c0 Delete type=0 #3
+2023/11/15-17:42:45.287310 7feb713c96c0 Manual compaction at level-0 from '!journal!056ILNNrLiPq3Gi3' @ 72057594037927935 : 1 .. '!journal!yfZxl4I7XAuUF6r3' @ 0 : 0; will stop at (end)