Fix infighter, actor entry context options, token size calculation, and duplicate reload tests, fix ingredient spell selector not showing

close #2511
close #2503

Author: moo-man

scripts/7f6OsttTzE7Hvzfk.js

@@ -1,5 +1,7 @@
-if (this.actor.statuses.has("infighting")) // Only add +10 if already infighting
-    args.prefillModifiers.modifier += 10; 
+if (this.actor.statuses.has("infighting") && !args.flags.infighter) 
+{
+    args.fields.modifier += 10;
+    args.flags.infighter = true;
+}
 
-
-args.prefillModifiers.successBonus += 1; 
+args.fields.successBonus += 1; 

scripts/sgS9rblPkQB36C8S.js

@@ -14,7 +14,7 @@ let index = game.packs
 	return i
 })
 
-let choice = await ItemDialog.create(index, 1, "Choose a Trade Skill")
+let choice = await ItemDialog.create(index, 1, {text : "Choose a Trade Skill, or select none to enter manually.", title : this.effect.name})
 let text;
 if (!choice[0])
 {

src/hooks/entryContext.js

@@ -11,14 +11,14 @@ export default function () {
   /**
    * Add right click option to actors to add all basic skills
    */
-  Hooks.on("getActorDirectoryEntryContext", async (html, options) => {
+  Hooks.on("getActorContextOptions", async (html, options) => {
     options.push(
       {
         name: game.i18n.localize("ACTOR.AddBasicSkills"),
         condition: game.user.isGM,
         icon: '<i class="fas fa-plus"></i>',
         callback: target => {
-          const actor = game.actors.get(target.attr('data-document-id'));
+          const actor = game.actors.get(target.dataset.entryId);
           actor.addBasicSkills();
         }
       })
@@ -28,7 +28,7 @@ export default function () {
         name: game.i18n.localize("ACTOR.ClearMount"),
         icon: '<i class="fas fa-horse"></i>',
         callback: target => {
-          const actor = game.actors.get(target.attr('data-document-id'));
+          const actor = game.actors.get(target.dataset.entryId);
           return actor.update({
             "system.status.mount": {
               "id": "",
@@ -49,7 +49,7 @@ export default function () {
         condition: game.user.isGM,
         icon: '<i class="fa fa-download"></i>',
         callback: target => {
-          const actor = game.actors.get(target.attr('data-document-id'));
+          const actor = game.actors.get(target.dataset.entryId);
           new StatBlockParser(actor).render(true)
         }
       })

src/model/actor/base.js

@@ -104,10 +104,11 @@ export class BaseActorModel extends BaseWarhammerActorModel {
     // Resize tokens based on size property
     checkSize() {
         let actor = this.parent
-        if (game.user.id != getActiveDocumentOwner(actor)?.id) {
-            return
-        }
-        if (actor.flags.autoCalcSize && game.canvas.ready) {
+
+        // if (game.user.id != getActiveDocumentOwner(actor)?.id) {
+        //     return
+        // }
+        if (actor.system.autoCalc.size && game.canvas.ready) {
             let tokenData = this.tokenSize();
             if (actor.isToken) 
             {

src/system/advancement.js

@@ -427,7 +427,7 @@ export default class Advancement
       {
         for (let i = 0; i < talent; i++) {
           let result = await game.wfrp4e.tables.rollTable("talents")
-          talentsToAdd.push(await this._advanceTalent(result.object.text));
+          talentsToAdd.push(await this._advanceTalent(result.object.name));
         }
         continue
       }

src/system/rolls/weapon-test.js

@@ -116,7 +116,6 @@ export default class WeaponTest extends AttackTest {
         this.item.system.loaded.value = false;
 
         let item = await this.item.update({ "system.loaded.amt": this.item.system.loaded.amt, "system.loaded.value": this.item.system.loaded.value });
-        await this.item.actor.checkReloadExtendedTest(item, this.actor);
       }
       else {
         await this.item.update({ "system.loaded.amt": this.item.system.loaded.amt })

static/templates/sheets/actor/tabs/actor-inventory.hbs

@@ -114,7 +114,7 @@
                                     <img src="{{this.img}}">
                                     <a class="label" data-action="toggleSummary">{{this.name}}</a>
                                 </div>
-                                {{#if (eq @../key "ingredients")}}
+                                {{#if (eq @../key "ingredient")}}
                                 <div class="flex">
                                     <select data-action="editProperty" data-path="system.spellIngredient.value">
                                         {{#select system.spellIngredient.value}}