Enhance stats

v10/v11 compat
2024-02-08 12:53:15 +01:00 · 2023-05-25 16:22:02 +02:00 · 2023-05-25 16:10:09 +02:00 · 2023-02-02 18:35:15 +01:00 · 2023-02-02 18:32:47 +01:00 · 2023-02-02 18:32:25 +01:00
22 changed files with 60 additions and 97 deletions
--- a/module/actor-sheet.js
+++ b/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
@ -61,12 +64,12 @@ export class SoSActorSheet extends ActorSheet {
    formData.gearsRoot = formData.gears.filter(item => item.system.containerid == "");
    for ( let container of formData.gearsRoot) {      
      if ( container.type == 'container') {
-        container.data.contains = []
-        container.data.containerEnc = 0;
+        container.system.contains = []
+        container.system.containerEnc = 0;
        for (let gear of formData.gears) {
          console.log("GEAR", gear, container)
          if ( gear.system.containerid == container.id) {
-            container.data.contains.push( gear )
+            container.system.contains.push( gear )
            if ( !gear.system.neg && !gear.system.software ) {
              container.system.containerEnc += (gear.system.big > 0) ? gear.system.big : 1;
            }
--- a/module/actor.js
+++ b/module/actor.js
@ -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 )
    }
  }

--- a/module/item-sheet.js
+++ b/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;
  }
  
--- a/module/sample-code.js
+++ b/module/sample-code.js
@ -1,24 +0,0 @@
- html.find('.item .item-name h4').click(event => this._onItemSummary(event));
- 
-  /**
-   * Handle toggling of an item from the Actor sheet
-   * @private
-   */
-  _onItemSummary(event) {
-    event.preventDefault();
-    let li = $(event.currentTarget).parents(".item"),
-        item = this.actor.getOwnedItem(li.data("item-id"));
-
-    // Toggle summary
-    if (item.data.data.description !== undefined && item.data.data.description !== null){
-      if ( li.hasClass("expanded") ) {
-        let summary = li.children(".item-summary");
-        summary.slideUp(200, () => summary.remove());
-      } else {
-        let div = $(`<div class="item-summary">${item.data.data.description}</div>`);
-        li.append(div.hide());
-        div.slideDown(200);
-      }
-      li.toggleClass("expanded");
-    }
-  }
--- a/module/sos-card-deck.js
+++ b/module/sos-card-deck.js
@ -247,7 +247,7 @@ export class SoSCardDeck  {
    if ( flipData.mode == 'stat' || flipData.mode == 'weapon' ) {
      flipData.baseScore = flipData.stat.value + flipData.malusConsequence + flipData.bonusConsequence + flipData.woundMalus;
    } else if (flipData.mode == 'skill') {
-      flipData.baseScore = Math.floor(flipData.stat.value/2) + flipData.skill.data.value + flipData.malusConsequence + flipData.bonusConsequence + flipData.woundMalus;
+      flipData.baseScore = Math.floor(flipData.stat.value/2) + flipData.skill.system.value + flipData.malusConsequence + flipData.bonusConsequence + flipData.woundMalus;
    }
    flipData.finalScore = flipData.baseScore + flipData.cardTotal + Number(flipData.modifier);
    flipData.magnitude = flipData.finalScore - flipData.tn;
@ -272,10 +272,10 @@ export class SoSCardDeck  {
  async processWeapon( flipData ) {
    flipData.damageCardsuit = flipData.cardSlot[flipData.cardSlotIndex].cardsuit;
    let damageKey = 'damage_'+ flipData.damageCardsuit;
-    flipData.damageString = flipData.weapon.data[damageKey];
+    flipData.damageString = flipData.weapon.system[damageKey];
    if (flipData.damageString.includes('Str') ) {
      let damageRegexp = flipData.damageString.match(  /Str([\d])?\+?([\d])?([LMSC])/i );
-      flipData.damageValue = (flipData.actor.data.data.stats.strength.value * Number(damageRegexp[1]?damageRegexp[1]:1)) + Number(damageRegexp[2]?damageRegexp[2]:0);
+      flipData.damageValue = (flipData.actor.system.stats.strength.value * Number(damageRegexp[1]?damageRegexp[1]:1)) + Number(damageRegexp[2]?damageRegexp[2]:0);
      flipData.damageSeverity = damageRegexp[3];
    } else {
      let damageRegexp = flipData.damageString.match( /(\d*)([LMSC])/i );
--- a/module/sos-combat.js
+++ b/module/sos-combat.js
@ -16,7 +16,7 @@ export class SoSCombat extends Combat {
        this.setInitiative(combatant.id, -1); // Reset init
        let uniq = randomID(16)
        const name = combatant.actor ? combatant.actor.name : combatant.name;
-        if (combatant.players && 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/module/sos-main.js
+++ b/module/sos-main.js
@ -15,6 +15,7 @@ import { SoSUtility } from "./sos-utility.js";
 import { SoSCombat } from "./sos-combat.js";
 import { gearConverter } from "./gears_convert.js";
 import { SoSGMDeck } from "./sos-gm-deck.js";
+import { ClassCounter} from "https://www.uberwald.me/fvtt_appcount/count-class-ready.js"

 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
@ -89,30 +90,6 @@ function welcomeMessage() {
    ` });
 }

-/* -------------------------------------------- */
-// Register world usage statistics
-function registerUsageCount( registerKey ) {
-  if ( game.user.isGM ) {
-    game.settings.register(registerKey, "world-key", {
-      name: "Unique world key",
-      scope: "world",
-      config: false,
-      default: "XXX",
-      type: String
-    });
-
-    let worldKey = game.settings.get(registerKey, "world-key")
-    if ( worldKey == undefined || worldKey == "" ) {
-      worldKey = randomID(32)
-      game.settings.set(registerKey, "world-key", worldKey )
-    }
-    // Simple API counter
-    let regURL = `https://www.uberwald.me/fvtt_appcount/count.php?name="${registerKey}"&worldKey="${worldKey}"&version="${game.release.generation}.${game.release.build}"&system="${game.system.id}"&systemversion="${game.system.version}"`
-    $.ajax(regURL)
-    /* -------------------------------------------- */
-  }
-}
-
 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
 /* -------------------------------------------- */
@ -126,7 +103,7 @@ Hooks.once("ready", function () {
      user: game.user._id
    });
  }
-  registerUsageCount("foundryvtt-shadows-over-sol")
+  ClassCounter.registerUsageCount()
  
  welcomeMessage();

--- a/module/sos-utility.js
+++ b/module/sos-utility.js
@ -122,7 +122,7 @@ export class SoSUtility  {
    let trappings = items.filter( item => item.type == 'gear' || item.type == 'armor' || item.type == 'weapon' );
    let sumEnc = 0;
    for (let object of trappings) {
-      if ( (!object.data.worn) && (!object.data.neg) && (!object.data.software) && (!object.data.implant) && (!object.data.containerid || object.data.containerid == "") ) {
+      if ( (!object.system.worn) && (!object.system.neg) && (!object.system.software) && (!object.system.implant) && (!object.system.containerid || object.system.containerid == "") ) {
        sumEnc += (object.big > 0) ? object.big : 1;
      }
    }
@ -275,20 +275,20 @@ export class SoSUtility  {
    }
    
    // DR management
-    let armor = flipData.target.actor.data.items.find( item => item.type == 'armor' && item.data.worn);
-    flipData.armorDR = armor ? armor.data.dr : 0;
-    flipData.armorGel = armor ?armor.data.gel : 0;
-    flipData.armorReflect = armor ? armor.data.reflect : 0;
-    let dr = flipData.target.actor.data.data.scores.dr.value + flipData.armorDR;
-    if (flipData.weapon.data.category == 'ballistic') {
+    let armor = flipData.target.actor.system.items.find( item => item.type == 'armor' && item.system.worn);
+    flipData.armorDR = armor ? armor.system.dr : 0;
+    flipData.armorGel = armor ?armor.system.gel : 0;
+    flipData.armorReflect = armor ? armor.system.reflect : 0;
+    let dr = flipData.target.actor.system.scores.dr.value + flipData.armorDR;
+    if (flipData.weapon.system.category == 'ballistic') {
      dr += flipData.armorGel; 
    }
-    if (flipData.weapon.data.category == 'laser') {
+    if (flipData.weapon.system.category == 'laser') {
      dr += flipData.armorReflect; 
    }

-    let shock = flipData.target.actor.data.data.scores.shock.value || 1;
-    let defenseCritical = flipData.target.actor.data.data.scores.defense.critical;
+    let shock = flipData.target.actor.system.scores.shock.value || 1;
+    let defenseCritical = flipData.target.actor.system.scores.defense.critical;
    flipData.damageStatus = 'apply_damage';

    flipData.targetShock = shock;
@ -341,17 +341,17 @@ export class SoSUtility  {

    // Is target able to dodge ??
    let defender = game.actors.get( flipData.target.actor._id);
-    flipData.coverConsequence = defender.data.items.find( item => item.type == 'consequence' && item.name == 'Cover');
-    flipData.APavailable = game.combat.getAPFromActor( defender.data._id );
+    flipData.coverConsequence = defender.items.find( item => item.type == 'consequence' && item.name == 'Cover');
+    flipData.APavailable = game.combat.getAPFromActor( defender._id );
    console.log("FLIPDATE : ", flipData);
    if ( !flipData.isReaction && flipData.APavailable > 0) {
-      if ( (flipData.weapon.data.category == 'melee' ) || ( (flipData.weapon.data.category == 'laser' || flipData.weapon.data.category == 'ballistic') && 
-        flipData.coverConsequence.data.severity != 'none') )  {
-        flipData.coverSeverityLevel = this.getConsequenceSeverityLevel( flipData.coverConsequence.data.severity ) * 2;
+      if ( (flipData.weapon.system.category == 'melee' ) || ( (flipData.weapon.system.category == 'laser' || flipData.weapon.system.category == 'ballistic') && 
+        flipData.coverConsequence.system.severity != 'none') )  {
+        flipData.coverSeverityLevel = this.getConsequenceSeverityLevel( flipData.coverConsequence.system.severity ) * 2;
        flipData.coverSeverityFlag  = (flipData.coverSeverityLevel > 0);
-        flipData.isMelee = (flipData.weapon.data.category == 'melee' );
-        let melee = defender.data.items.find( item => item.type == 'skill' && item.name == 'Melee');
-        flipData.defenderMelee = melee.data.value;
+        flipData.isMelee = (flipData.weapon.system.category == 'melee' );
+        let melee = defender.items.find( item => item.type == 'skill' && item.name == 'Melee');
+        flipData.defenderMelee = melee.system.value;
        flipData.uniqId = randomID(16);
        this.registry[flipData.uniqId] = flipData;
        let html = await renderTemplate('systems/foundryvtt-shadows-over-sol/templates/chat-damage-request-dodge.html', flipData );
--- a/system.json
+++ b/system.json
@ -4,11 +4,11 @@
  "description": "Shadows over Sol for FoundryVTT",
  "url": "https://www.uberwald.me/gitea/public/foundryvtt-shadows-over-sol/",
  "license": "LICENSE.txt",
-  "version": "10.0.6",
+  "version": "11.0.1",
  "compatibility": {
    "minimum": "10",
-    "verified": "10.285",
-    "maximum": "10"
+    "verified": "10",
+    "maximum": "11"
  },
  "esmodules": [
    "module/sos-main.js"
@ -109,7 +109,7 @@
  ],
  "socket": true,
  "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-10.0.6.zip",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-shadows-over-sol/archive/foundryvtt-shadows-over-sol-11.0.1.zip",
  "gridDistance": 5,
  "gridUnits": "ft"
 }
--- a/templates/actor-sheet.html
+++ b/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"}}
--- a/templates/editor-notes-gm.html
+++ b/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}}
--- a/templates/item-action-sheet.html
+++ b/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>
--- a/templates/item-commongear-sheet.html
+++ b/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>
--- a/templates/item-consequence-sheet.html
+++ b/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>
--- a/templates/item-geneline-sheet.html
+++ b/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>
--- a/templates/item-injury-sheet.html
+++ b/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>
--- a/templates/item-language-sheet.html
+++ b/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>
--- a/templates/item-malady-sheet.html
+++ b/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>
--- a/templates/item-skill-sheet.html
+++ b/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>
--- a/templates/item-skillexperience-sheet.html
+++ b/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>
--- a/templates/item-subculture-sheet.html
+++ b/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">
--- a/templates/item-weakness-sheet.html
+++ b/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>
Author	SHA1	Message	Date
LeRatierBretonnien	a3b6908a17	Enhance stats	2024-02-08 12:53:15 +01:00
LeRatierBretonnien	6e5bb5da32	v10/v11 compat	2023-05-25 16:22:02 +02:00
LeRatierBretonnien	29ff86f4bd	v10/v11 compat	2023-05-25 16:10:09 +02:00
LeRatierBretonnien	aa243a7b80	Sync	2023-02-02 18:35:15 +01:00
LeRatierBretonnien	c061b67bb3	Sync	2023-02-02 18:32:47 +01:00
LeRatierBretonnien	c6c8622552	Sync	2023-02-02 18:32:25 +01:00
LeRatierBretonnien	f6104e533c	Sync	2023-02-02 18:28:24 +01:00
LeRatierBretonnien	23b6a41eac	Sync	2023-02-02 18:25:16 +01:00
LeRatierBretonnien	f0c5e7b95d	Sync	2023-02-02 18:24:58 +01:00
sladecraven	4b9af6a383	Allow items links in editors	2022-09-28 15:53:50 +02:00