v10/v11 compat

module/actor-sheet.js

@@ -22,7 +22,7 @@ export class SoSActorSheet extends ActorSheet {
   }
 
   /* -------------------------------------------- */
-  getData() {
+  async getData() {
     const objectData = this.object
     let formData = {
       title: this.title,
@@ -34,6 +34,9 @@ export class SoSActorSheet extends ActorSheet {
       cssClass: this.isEditable ? "editable" : "locked",
       data: foundry.utils.deepClone(this.object.system),
       effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
+      history:  await TextEditor.enrichHTML(this.object.system.history, {async: true}),
+      notes:  await TextEditor.enrichHTML(this.object.system.notes, {async: true}),
+      gmnotes:  await TextEditor.enrichHTML(this.object.system.gmnotes, {async: true}),
       limited: this.object.limited,
       options: this.options,
       owner: this.document.isOwner

module/actor.js

@@ -335,7 +335,7 @@ export class SoSActor extends Actor {
         totalWounds: this.system.scores.wound.value  
       }
       let html = await renderTemplate('systems/foundryvtt-shadows-over-sol/templates/chat-character-death.html',  woundData );
-      ChatMessage.create( { content: html, whisper: [ChatMessage.getWhisperRecipients(this.name), ChatMessage.getWhisperRecipients("GM") ] } );
+      ChatMessage.create( { content: html, whisper: ChatMessage.getWhisperRecipients(this.name).concat(ChatMessage.getWhisperRecipients("GM") ) } )
     }
   }
 
@@ -369,7 +369,7 @@ export class SoSActor extends Actor {
       totalWounds: this.system.scores.wound.value
     }
     let html = await renderTemplate('systems/foundryvtt-shadows-over-sol/templates/chat-damage-consequence.html',  woundData );
-    ChatMessage.create( { content: html, whisper: ChatMessage.getWhisperRecipients(this.name).concat(ChatMessage.getWhisperRecipients("GM"))  } );
+    ChatMessage.create( { content: html, whisper: ChatMessage.getWhisperRecipients(this.name).concat(ChatMessage.getWhisperRecipients("GM")) } )
 
     this.checkDeath();
   }
@@ -388,10 +388,10 @@ export class SoSActor extends Actor {
       if ( alreadyInside.length >= container.system.container ) {
         ui.notifications.warn("Container is already full !");
       } else { 
-        await this.updateEmbeddedDocuments( "Item", [{ _id: object.id, 'system.containerid':containerId }]);
+        setTimeout(function() { this.updateEmbeddedDocuments( "Item", [{ _id: object.id, 'system.containerid':containerId }])}, 800 )
       }
     } else if ( object && object.system.containerid) { // remove from container
-      await this.updateEmbeddedDocuments( "Item", [{ _id: object.id, 'system.containerid':"" }]);
+      setTimeout(function() { this.updateEmbeddedDocuments( "Item", [{ _id: object.id, 'system.containerid':"" }])}, 800 )
     }
   }
 
@@ -399,7 +399,7 @@ export class SoSActor extends Actor {
   async applyWounds( flipData ) {
     if ( flipData.damageStatus == 'no_damage') {
       let html = await renderTemplate('systems/foundryvtt-shadows-over-sol/templates/chat-nodamage-taken.html', flipData );
-      ChatMessage.create( { content: html, whisper: [ChatMessage.getWhisperRecipients(this.name), ChatMessage.getWhisperRecipients("GM") ] } );        
+      ChatMessage.create( { content: html, whisper: ChatMessage.getWhisperRecipients(this.name).concat(ChatMessage.getWhisperRecipients("GM")) } );        
       return;
     }
 
@@ -437,7 +437,7 @@ export class SoSActor extends Actor {
     flipData.currentWounds = sumWound;
     flipData.totalWounds = this.system.scores.wound.value;
     let html = await renderTemplate('systems/foundryvtt-shadows-over-sol/templates/chat-damage-taken.html', flipData );
-    ChatMessage.create( { content: html, whisper: [ChatMessage.getWhisperRecipients(this.name), ChatMessage.getWhisperRecipients("GM") ] } );
+    ChatMessage.create( { content: html, whisper: ChatMessage.getWhisperRecipients(this.name).concat(ChatMessage.getWhisperRecipients("GM")) } );
 
     this.checkDeath();
   }

module/item-sheet.js

@@ -56,7 +56,8 @@ export class SoSItemSheet extends ItemSheet {
       effects: this.object.effects.map(e => foundry.utils.deepClone(e.system)),
       limited: this.object.limited,
       options: this.options,
-      owner: this.document.isOwner
+      owner: this.document.isOwner,
+      description:  await TextEditor.enrichHTML(this.object.system.description, {async: true}),
     };
 
     formData.isGM = game.user.isGM; 
@@ -66,6 +67,12 @@ export class SoSItemSheet extends ItemSheet {
     if ( objectData.type == 'skill' && this.object.options?.actor) {
       formData.skillExperienceList = this.object.options.actor.getSkillExperience( objectData.name )
     }
+    if ( objectData.type == 'geneline') {
+      formData.weakness = await TextEditor.enrichHTML(this.object.system.weakness, {async: true})      
+    }
+    if ( objectData.type == 'malady') {
+      formData.notes = await TextEditor.enrichHTML(this.object.system.notes, {async: true})      
+    }
     return formData;
   }
   

module/sos-combat.js

@@ -9,22 +9,26 @@ export class SoSCombat extends Combat {
   /* -------------------------------------------- */
   requestActions() {
     if (game.user.isGM && !this.actionsRequested) {
-      console.log("REQUEST ACTIONS !!!");
+      console.log("REQUEST ACTIONS !!!")
       this.actionsRequested = true;
       this.phaseSetup = {}; // Reset each new round/update
       for (let combatant of this.combatants) {
-        this.setInitiative(combatant._id, -1 ); // Reset init
-        let uniq = randomID(16);
+        this.setInitiative(combatant.id, -1); // Reset init
+        let uniq = randomID(16)
         const name = combatant.actor ? combatant.actor.name : combatant.name;
-        if ( combatant.players[0]) {
+        if (combatant.players && combatant.players[0]) {
           // A player controls this combatant -> message !
-          ChatMessage.create( { content: `New round ! Click on the button below to declare the actions of ${name} for round ${this.round} !<br>
-          <a class='chat-card-button' id='button-declare-actions' data-uniq-id='${uniq}' data-combatant-id='${combatant._id}' data-combat-id='${this._id}' data-round='${this.round}'>Declare actions</a>`, 
-                          whisper: [ combatant.players[0].data._id] } );
+          ChatMessage.create({
+            content: `New round ! Click on the button below to declare the actions of ${name} for round ${this.round} !<br>
+          <a class='chat-card-button' id='button-declare-actions' data-uniq-id='${uniq}' data-combatant-id='${combatant.id}' data-combat-id='${this.id}' data-round='${this.round}'>Declare actions</a>`,
+            whisper: [combatant.players[0].id]
+          });
         } else {
-          ChatMessage.create( { content: `New round ! Click on the button below to declare the actions of ${name} for round ${this.round} !<br>
-          <a class='chat-card-button' id='button-declare-actions' data-uniq-id='${uniq}' data-combatant-id='${combatant._id}' data-combat-id='${this._id}' data-round='${this.round}'>Declare actions</a>`, 
-                          whisper: [ ChatMessage.getWhisperRecipients("GM") ] } );
+          ChatMessage.create({
+            content: `New round ! Click on the button below to declare the actions of ${name} for round ${this.round} !<br>
+              <a class='chat-card-button' id='button-declare-actions' data-uniq-id='${uniq}' data-combatant-id='${combatant.id}' data-combat-id='${this.id}' data-round='${this.round}'>Declare actions</a>`,
+              whisper: ChatMessage.getWhisperRecipients("GM"),
+          });
         }
       }
     }
@@ -58,8 +62,9 @@ export class SoSCombat extends Combat {
       let actionData = this.phaseSetup[combatantId];
       if (actionData.phaseArray[phaseIndex].name != 'No Action') {
         let combatant = this.combatants.find(comb => comb._id == actionData.combatantId);
-        const name = combatant.actor ? combatant.actor.data.name : combatant.name;
-        actionList.push( {  combatant: combatant, 
+        const name = combatant.actor ? combatant.actor.name : combatant.name;
+        actionList.push({
+          combatant: combatant,
           action: actionData.phaseArray[phaseIndex],
           isDone: false
         });
@@ -77,18 +82,22 @@ export class SoSCombat extends Combat {
     for (let action of actionList) {
       let uniq = randomID(16);
       action.uniqId = uniq; // Easy tracking with chat messages
-      const name = action.combatant.actor ? action.combatant.actor.data.name : action.combatant.name;
+      const name = action.combatant.actor ? action.combatant.actor.name : action.combatant.name;
       if (action.combatant.players[0]) {
         // A player controls this combatant -> message !
-        ChatMessage.create( { content: `Phase ${this.phaseNumber} ! ${name} must perform a <strong>${action.action.name}</strong> action.
+        ChatMessage.create({
+          content: `Phase ${this.phaseNumber} ! ${name} must perform a <strong>${action.action.name}</strong> action.
               When done, click on the button below to close the action.
-              <a class='chat-card-button' id='button-end-action' data-uniq-id='${uniq}' data-combatant-id='${action.combatant._id}' data-combat-id='${this._id}' data-round='${this.round}'>Action is done !</a>`, 
-                        whisper: [ action.combatant.players[0].data._id] } );
+              <a class='chat-card-button' id='button-end-action' data-uniq-id='${uniq}' data-combatant-id='${action.combatant.id}' data-combat-id='${this.id}' data-round='${this.round}'>Action is done !</a>`,
+          whisper: [action.combatant.players[0].id]
+        });
       } else {
-        ChatMessage.create( { content: `Phase ${this.phaseNumber} ! ${name} must perform a <strong>${action.action.name}</strong> action.<br>
+        ChatMessage.create({
+          content: `Phase ${this.phaseNumber} ! ${name} must perform a <strong>${action.action.name}</strong> action.<br>
               When done, click on the button below to close the action.
-              <a class='chat-card-button' id='button-end-action' data-uniq-id='${uniq}' data-combatant-id='${action.combatant._id}' data-combat-id='${this._id}' data-round='${this.round}'>Action is done !</a>`, 
-                    whisper: [ ChatMessage.getWhisperRecipients("GM") ] } );
+              <a class='chat-card-button' id='button-end-action' data-uniq-id='${uniq}' data-combatant-id='${action.combatant.id}' data-combat-id='${this.id}' data-round='${this.round}'>Action is done !</a>`,
+          whisper: ChatMessage.getWhisperRecipients("GM")
+        });
       }
     }
     // Save for easy access
@@ -100,8 +109,8 @@ export class SoSCombat extends Combat {
     if (game.user.isGM) {
       for (let combatant of this.combatants) {
         if (!combatant.actor) continue; // Can't check tokens without assigned actors, Maybe print chat message about bleeding happening so that the GM can manually track this?
-        let bleeding = combatant.actor.data.items.find( item => item.type == 'consequence' && item.name == 'Bleeding');
-        combatant.actor.applyConsequenceWound( bleeding.data.severity, "bleeding" );
+        let bleeding = combatant.actor.items.find(item => item.type == 'consequence' && item.name == 'Bleeding');
+        combatant.actor.applyConsequenceWound(bleeding.system.severity, "bleeding");
       }
     }
   }
@@ -109,8 +118,8 @@ export class SoSCombat extends Combat {
   /* -------------------------------------------- */
   closeAction(uniqId) {
     // Delete message !    
-    const toDelete = game.messages.filter(it => it.data.content.includes( uniqId ));
-    toDelete.forEach(it => it.delete());
+    const toDelete = game.messages.filter(it => it.content.includes(uniqId));
+    toDelete.forEach(it => it.delete())
 
     let action = this.currentActions.find(_action => _action.uniqId == uniqId);
     if (action) {
@@ -139,8 +148,8 @@ export class SoSCombat extends Combat {
   getAPFromActor(actorId) {
     for (let combatant of this.combatants) {
       //console.log(combatant);
-      if ( combatant.actor.data._id == actorId ) {
-        let phase = this.phaseSetup[combatant._id]; 
+      if (combatant.actor.id == actorId) {
+        let phase = this.phaseSetup[combatant.id];
         return phase.remainingAP;
       }
     }
@@ -151,8 +160,8 @@ export class SoSCombat extends Combat {
   decreaseAPFromActor(actorId) {
     for (let combatant of this.combatants) {
       //console.log(combatant);
-      if ( combatant.actor.data._id == actorId ) {
-        let phase = this.phaseSetup[combatant._id]; 
+      if (combatant.actor.id == actorId) {
+        let phase = this.phaseSetup[combatant.id];
         phase.remainingAP -= 1;
         if (phase.remainingAP < 0) phase.remainingAP = 0;
       }
@@ -164,8 +173,7 @@ export class SoSCombat extends Combat {
     console.log("Setting combat for phase : ", actionConf, actionConf.uniqId);
 
     // Delete message !
-    const toDelete = game.messages.filter(it => it.data.content.includes( actionConf.uniqId ));
-    console.log("MESSAGE : ", toDelete);
+    const toDelete = game.messages.filter(it => it.content.includes(actionConf.uniqId));
     toDelete.forEach(it => it.delete());
 
     if (!this.phaseSetup) this.phaseSetup = {}; // Opportunistic init    
@@ -182,8 +190,10 @@ export class SoSCombat extends Combat {
     }
     if (actionsDone) {
       this.actionsRequested = false;
-      ChatMessage.create( { content: `Action declaration has been completed ! Now proceeding with actions.`, 
-                            whisper: [ ChatMessage.getWhisperRecipients("GM") ] } );  
+      ChatMessage.create({
+        content: `Action declaration has been completed ! Now proceeding with actions.`,
+        whisper: ChatMessage.getWhisperRecipients("GM")
+      })
       this.phaseNumber = 3;
       this.nextTurn();
     }

module/sos-dialog-combat-actions.js

@@ -12,7 +12,7 @@ export class SoSDialogCombatActions extends Dialog {
       actionPoints: SoSUtility.fillRange(0, 6),
       combatId: combatId,      
       combatantId: combatantId,
-      combatantsList: combat.data.combatants,
+      combatantsList: combat.combatants,
       uniqId: uniqId,
       round: round
     }

module/sos-gm-deck.js

@@ -60,7 +60,7 @@ export class SoSGMDeck extends Dialog {
     let cardPath =  `systems/foundryvtt-shadows-over-sol/img/cards/${card.cardName}.webp`;
     let cardData = { card: card, cardPath: cardPath };
     let html = await renderTemplate('systems/foundryvtt-shadows-over-sol/templates/chat-card.html', cardData );
-    ChatMessage.create( { content: html, whisper: [ ChatMessage.getWhisperRecipients("GM") ] });  
+    ChatMessage.create( { content: html, whisper: ChatMessage.getWhisperRecipients("GM") } );  
     //dialog.onFlipClose();
   }
 

system.json

@@ -2,19 +2,14 @@
   "id": "foundryvtt-shadows-over-sol",
   "title": "Shadows over Sol",
   "description": "Shadows over Sol for FoundryVTT",
-  "author": "LeRatierBretonnien",
-  "authors": [],
   "url": "https://www.uberwald.me/gitea/public/foundryvtt-shadows-over-sol/",
   "license": "LICENSE.txt",
-  "flags": {},
-  "version": "10.0.0",
+  "version": "11.0.0",
   "compatibility": {
-    "minimum": 10,
-    "verified": 10,
-    "maximum": 10
+    "minimum": "10",
+    "verified": "10",
+    "maximum": "11"
   },
-  "templateVersion": 50,
-  "scripts": [],
   "esmodules": [
     "module/sos-main.js"
   ],
@@ -25,88 +20,96 @@
     {
       "lang": "en",
       "name": "English",
-      "path": "lang/en.json"
+      "path": "lang/en.json",
+      "flags": {}
     }
   ],
   "packs": [
     {
       "name": "skills",
       "label": "Skills",
-      "path": "./packs/skills.db",
+      "path": "packs/skills.db",
       "type": "Item",
       "system": "foundryvtt-shadows-over-sol",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "name": "consequences",
       "label": "Consequences",
-      "path": "./packs/consequences.db",
+      "path": "packs/consequences.db",
       "type": "Item",
       "system": "foundryvtt-shadows-over-sol",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "name": "gears",
       "label": "Gears",
-      "path": "./packs/gears.db",
+      "path": "packs/gears.db",
       "type": "Item",
       "system": "foundryvtt-shadows-over-sol",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "name": "injuries",
       "label": "Injuries",
-      "path": "./packs/injuries.db",
+      "path": "packs/injuries.db",
       "type": "Item",
       "system": "foundryvtt-shadows-over-sol",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "name": "weaknesses",
       "label": "Weaknesses",
-      "path": "./packs/weaknesses.db",
+      "path": "packs/weaknesses.db",
       "type": "Item",
       "system": "foundryvtt-shadows-over-sol",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "name": "languages",
       "label": "Languages",
-      "path": "./packs/languages.db",
+      "path": "packs/languages.db",
       "type": "Item",
       "system": "foundryvtt-shadows-over-sol",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "name": "combat-actions",
       "label": "Combat Actions",
-      "path": "./packs/combat-actions.db",
+      "path": "packs/combat-actions.db",
       "type": "Item",
       "system": "foundryvtt-shadows-over-sol",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "name": "genelines",
       "label": "Genelines",
-      "path": "./packs/genelines.db",
+      "path": "packs/genelines.db",
       "type": "Item",
       "system": "foundryvtt-shadows-over-sol",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "name": "subcultures",
       "label": "Subcultures",
-      "path": "./packs/subcultures.db",
+      "path": "packs/subcultures.db",
       "type": "Item",
       "system": "foundryvtt-shadows-over-sol",
-      "private": false
+      "private": false,
+      "flags": {}
     }
   ],
-  "relationships": { },
   "socket": true,
-  "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-shadows-over-sol/raw/branch/master/system.json",
-  "download": "https://www.uberwald.me/gitea/public/foundryvtt-shadows-over-sol/archive/foundryvtt-shadows-over-sol-10.0.0.zip",
-  "protected": false,
+  "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-shadows-over-sol/raw/branch/v10/system.json",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-shadows-over-sol/archive/foundryvtt-shadows-over-sol-11.0.0.zip",
   "gridDistance": 5,
   "gridUnits": "ft"
 }

templates/actor-sheet.html

@@ -390,12 +390,12 @@
           <hr>
           <h3>Biography : </h3>
           <div class="form-group editor">
-            {{editor data.history target="system.history" button=true owner=owner editable=editable}}
+            {{editor history target="system.history" button=true owner=owner editable=editable}}
           </div>
           <hr>
           <h3>Notes : </h3>
           <div class="form-group editor">
-            {{editor data.notes target="system.notes" button=true owner=owner editable=editable}}
+            {{editor notes target="system.notes" button=true owner=owner editable=editable}}
           </div>
           <hr>
           {{>"systems/foundryvtt-shadows-over-sol/templates/editor-notes-gm.html"}}

templates/editor-notes-gm.html

@@ -1,6 +1,6 @@
 {{#if data.isGM}}
 <h3>GM Notes : </h3>
 <div class="form-group editor">
-  {{editor data.gmnotes target="system.gmnotes" button=true owner=owner editable=editable}}
+  {{editor gmnotes target="system.gmnotes" button=true owner=owner editable=editable}}
 </div>
 {{/if}}

templates/item-action-sheet.html

@@ -36,7 +36,7 @@
           <div class="flexcol">
             <label class="generic-label">Description</label>
             <div class="form-group medium-editor">
-              {{editor data.description target="system.description" button=true owner=owner editable=editable}}
+              {{editor description target="system.description" button=true owner=owner editable=editable}}
             </div>
           </div>
         </div>

templates/item-commongear-sheet.html

@@ -46,6 +46,6 @@
   <div class="flexcol">
     <label class="generic-label">Description</label>
     <div class="form-group medium-editor">
-      {{editor data.description target="system.description" button=true owner=owner editable=editable}}
+      {{editor description target="system.description" button=true owner=owner editable=editable}}
     </div>
   </div>

templates/item-consequence-sheet.html

@@ -27,7 +27,7 @@
           <div class="flexcol">
             <label class="generic-label">Description</label>
             <div class="form-group medium-editor">
-              {{editor data.description target="system.description" button=true owner=owner editable=editable}}
+              {{editor description target="system.description" button=true owner=owner editable=editable}}
             </div>
           </div>
         </div>

templates/item-geneline-sheet.html

@@ -13,7 +13,7 @@
           <div class="flexcol">
             <label class="generic-label">Description</label>
             <div class="form-group medium-editor">
-              {{editor data.description target="system.description" button=true owner=owner editable=editable}}
+              {{editor description target="system.description" button=true owner=owner editable=editable}}
             </div>
           </div>
           <div class="flexcol">
@@ -31,7 +31,7 @@
           <div class="flexcol">
             <label class="generic-label">Weakness</label>
             <div class="form-group small-editor">
-              {{editor data.weakness target="system.weakness" button=true owner=owner editable=editable}}
+              {{editor weakness target="system.weakness" button=true owner=owner editable=editable}}
             </div>
           </div>
         </div>

templates/item-injury-sheet.html

@@ -17,7 +17,7 @@
           <div class="flexcol">
             <label class="generic-label">Description</label>
             <div class="form-group medium-editor">
-              {{editor data.description target="system.description" button=true owner=owner editable=editable}}
+              {{editor description target="system.description" button=true owner=owner editable=editable}}
             </div>
           </div>
         </div>

templates/item-language-sheet.html

@@ -13,7 +13,7 @@
           <div class="flexcol">
             <label class="generic-label">Description</label>
             <div class="form-group medium-editor">
-              {{editor data.description target="system.description" button=true owner=owner editable=editable}}
+              {{editor description target="system.description" button=true owner=owner editable=editable}}
             </div>
           </div>
         </div>

templates/item-malady-sheet.html

@@ -24,7 +24,7 @@
           <div class="flexcol">
             <label class="generic-label">Notes</label>
             <div class="form-group medium-editor">
-              {{editor data.notes target="system.notes" button=true owner=owner editable=editable}}
+              {{editor notes target="system.notes" button=true owner=owner editable=editable}}
             </div>
           </div>
         </div>

templates/item-skill-sheet.html

@@ -27,7 +27,7 @@
               {{/each}}
             </ul>
           <label class="generic-label">Description</label>
-          {{editor data.description target="system.description" button=true owner=owner editable=editable}}
+          {{editor description target="system.description" button=true owner=owner editable=editable}}
         </div>
 
     </section>

templates/item-skillexperience-sheet.html

@@ -25,7 +25,7 @@
           <div class="flexcol">
             <label class="generic-label">Description</label>
             <div class="form-group medium-editor">
-              {{editor data.description target="system.description" button=true owner=owner editable=editable}}
+              {{editor description target="system.description" button=true owner=owner editable=editable}}
             </div>
           </div>
         </div>

templates/item-subculture-sheet.html

@@ -13,7 +13,7 @@
           <div class="flexcol">
             <label class="generic-label">Description</label>
             <div class="form-group medium-editor">
-              {{editor data.description target="system.description" button=true owner=owner editable=editable}}
+              {{editor description target="system.description" button=true owner=owner editable=editable}}
             </div>
           </div>
           <div class="flexcol">

templates/item-weakness-sheet.html

@@ -26,7 +26,7 @@
           <div class="flexcol">
             <label class="generic-label">Description</label>
             <div class="form-group medium-editor">
-              {{editor data.description target="system.description" button=true owner=owner editable=editable}}
+              {{editor description target="system.description" button=true owner=owner editable=editable}}
             </div>
           </div>
         </div>