8.3.1 - close #2324

moo-man · Dec 5, 2024 · d279067 · d279067
1 parent b69a227
commit d279067
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 15 deletions.
diff --git a/modules/apps/chargen/char-gen.js b/modules/apps/chargen/char-gen.js
@@ -377,7 +377,7 @@ export default class CharGenWfrp4e extends FormApplication {
         let actorItems = this.actor.items;
         this.actor.items = [];
         let document = await Actor.create(this.actor, {skipItems : true});
-        await document.createEmbeddedDocuments("Item", actorItems)
+        await document.createEmbeddedDocuments("Item", actorItems, {skipSpecialisationChoice : true})
         for(let i of document.items.contents)
         {
           // Run onCreate scripts
@@ -392,9 +392,9 @@ export default class CharGenWfrp4e extends FormApplication {
         for(let i of tempActor.items.contents)
         {
           // Run preCreate scripts
-          await i._preCreate(i._source, {}, game.user.id);
+          await i._preCreate(i._source, {skipSpecialisationChoice : true}, game.user.id);
         }
-        const payload =  {id : game.user.id, data : tempActor.toObject()}
+        const payload =  {id : game.user.id, data : tempActor.toObject(), options : {skipSpecialisationChoice : true}}
         let id = await SocketHandlers.executeOnUserAndWait("GM", "createActor", payload);
         let actor = game.actors.get(id);
         if (actor && actor.isOwner) {

diff --git a/modules/apps/wfrp-browser.js b/modules/apps/wfrp-browser.js
@@ -320,13 +320,18 @@ export default class BrowserWfrp4e extends Application {
           }
             break;
 
-          case "characteristics":
           case "skills":
           case "talents":
             if (this.filters.dynamic[filter].value.length && this.filters.dynamic[filter].value.some(x => x))
               filteredItems = filteredItems.filter(i => !i.system[filter] || (i.system[filter] && this.filters.dynamic[filter].value.every(value => { return i.system[filter].find(v => v.toLowerCase().includes(value.toLowerCase())) })))
             break;
 
+
+          case "characteristics":
+            if (this.filters.dynamic[filter].value.length && this.filters.dynamic[filter].value.some(x => x))
+              filteredItems = filteredItems.filter(i => !i.system[filter] || (i.system[filter] && this.filters.dynamic[filter].value.every(value => { return i.system[filter][value.toLowerCase()]})))
+              break;
+
           case "twohanded":
           case "rollable":
           case "magicMissile":

diff --git a/modules/model/item/career.js b/modules/model/item/career.js
@@ -178,7 +178,7 @@ export class CareerModel extends BaseItemModel
         data.properties.push(`<b>${game.i18n.localize("Class")}</b>: ${this.class.value}`);
         data.properties.push(`<b>${game.i18n.localize("Group")}</b>: ${this.careergroup.value}`);
         data.properties.push(game.wfrp4e.config.statusTiers[this.status.tier] + " " + this.status.standing);
-        data.properties.push(`<b>${game.i18n.localize("Characteristics")}</b>: ${this.characteristics.map(i => i = " " + game.wfrp4e.config.characteristicsAbbrev[i])}`);
+        data.properties.push(`<b>${game.i18n.localize("Characteristics")}</b>: ${Object.keys(this.characteristics).filter(i => this.characteristics[i]).map(i => i = " " + game.wfrp4e.config.characteristicsAbbrev[i])}`);
         data.properties.push(`<b>${game.i18n.localize("Skills")}</b>: ${this.skills.map(i => i = " " + i)}`);
         data.properties.push(`<b>${game.i18n.localize("Talents")}</b>: ${this.talents.map(i => i = " " + i)}`);
         data.properties.push(`<b>${game.i18n.localize("Trappings")}</b>: ${this.trappings.map(i => i = " " + i)}`);
@@ -192,7 +192,7 @@ export class CareerModel extends BaseItemModel
         properties.push(`<b>${game.i18n.localize("Class")}</b>: ${this.class.value}`);
         properties.push(`<b>${game.i18n.localize("Group")}</b>: ${this.careergroup.value}`);
         properties.push(`<b>${game.i18n.localize("Status")}</b>: ${game.wfrp4e.config.statusTiers[this.status.tier] + " " + this.status.standing}`);
-        properties.push(`<b>${game.i18n.localize("Characteristics")}</b>: ${this.characteristics.map(i => i = " " + game.wfrp4e.config.characteristicsAbbrev[i])}`);
+        properties.push(`<b>${game.i18n.localize("Characteristics")}</b>: ${Object.keys(this.characteristics).filter(i => this.characteristics[i]).map(i => i = " " + game.wfrp4e.config.characteristicsAbbrev[i])}`);
         properties.push(`<b>${game.i18n.localize("Skills")}</b>: ${this.skills.map(i => i = " " + "<a class = 'skill-lookup'>" + i + "</a>")}`);
         properties.push(`<b>${game.i18n.localize("Talents")}</b>: ${this.talents.map(i => i = " " + "<a class = 'talent-lookup'>" + i + "</a>")}`);
         properties.push(`<b>${game.i18n.localize("Trappings")}</b>: ${this.trappings.map(i => i = " " + i)}`);

diff --git a/modules/system/socket-handlers.js b/modules/system/socket-handlers.js
@@ -88,7 +88,7 @@ export default function () {
                 default: 0,
                 [id]: 3
             }
-            let actor = await Actor.implementation.create(actorData)
+            let actor = await Actor.implementation.create(actorData, payload.options || {})
             return actor.id;
         },
 

diff --git a/static/templates/apps/chargen/attributes.hbs b/static/templates/apps/chargen/attributes.hbs
@@ -74,13 +74,15 @@
 
       <p class="centered">{{localize "CHARGEN.Attributes.CharacteristicAdvances"}}</p>
       <div class="flexrow">
-        {{#each data.items.career.system.characteristics as |characteristic ch|}}
-        <div class="flexcol allocation-input">
-            <h4>{{configLookup "characteristics" characteristic}}</h4>
-            {{#with (lookup ../context.characteristics characteristic)}}
-            <input class="ch-advance" value="{{advances}}" data-ch="{{../this}}" type="number">
+        {{#each data.items.career.system.characteristics}}
+            {{#if this}}
+            <div class="flexcol allocation-input">
+            <h4>{{configLookup "characteristics" @key}}</h4>
+            {{#with (lookup ../context.characteristics @key)}}
+              <input class="ch-advance" value="{{advances}}" data-ch="{{@key}}" type="number">
             {{/with}}
-        </div>
+          </div>
+            {{/if}}
           {{/each}}
       </div>
     </div>

diff --git a/system.json b/system.json
@@ -2,7 +2,7 @@
   "id": "wfrp4e",
   "title": "Warhammer Fantasy Roleplay 4th Edition",
   "description": "A comprehensive system for running grim and perilous games of Warhammer Fantasy Roleplay in the Foundry VTT environment.",
-  "version": "8.3.0",
+  "version": "8.3.1",
   "authors" : [
     {
       "name": "Moo Man",
@@ -72,6 +72,6 @@
   },
   "socket": true,
   "manifest" :  "https://github.com/moo-man/WFRP4e-FoundryVTT/releases/latest/download/system.json",
-  "download" :  "https://github.com/moo-man/WFRP4e-FoundryVTT/releases/download/8.3.0/wfrp4e.zip",
+  "download" :  "https://github.com/moo-man/WFRP4e-FoundryVTT/releases/download/8.3.1/wfrp4e.zip",
   "url" : "https://github.com/moo-man/WFRP4e-FoundryVTT"
 }