add "targeted" trigger, career level config entry, other fixes

Author: moo-man

src/apps/roll-dialog/skill-dialog.js

@@ -12,7 +12,7 @@ export default class SkillDialog extends CharacteristicDialog {
 
     get extendedTest() 
     {
-        return fromUuidSync(this.options.extended);
+        return fromUuidSync(this.context.extended);
     }
 
     get skill() 

src/model/actor/standard.js

@@ -67,6 +67,20 @@ export class StandardActorModel extends BaseActorModel {
 
     }
 
+    async _onUpdate(data, options, user)
+    {
+        await super._onUpdate(data, options, user);
+
+        if (foundry.utils.getProperty(options, "changed.flags.oppose.opposeMessageId", game.user.id == warhammer.utility.getActiveDocumentOwner(this.parent)?.id))
+        {
+            let attacker = this.parent.attacker;
+            if (attacker)
+            {
+                this.parent.runScripts("targeted", {attacker})
+            }
+        }
+    }
+
     /**
      * @return {ItemWFRP4e|undefined}
      */

src/model/item/career.js

@@ -21,7 +21,7 @@ export class CareerModel extends BaseItemModel
         });
         schema.level = new fields.SchemaField({
             // value: new fields.NumberField({min: 1, choices : [1, 2, 3, 4], initial : 1})
-            value: new fields.NumberField({min: 1, choices : {1 : "1", 2 : "2", 3 : "3", 4 : "4"}, initial : 1})
+            value: new fields.NumberField({min: 1,  choices: game.wfrp4e.config.careerLevels, initial : 1})
         });
         schema.status = new fields.SchemaField({
             standing: new fields.NumberField({min: 1}),

src/system/config-wfrp4e.js

@@ -1231,6 +1231,14 @@ WFRP4E.systemEffects = {}
 WFRP4E.vehicleSystemEffects = {}
 WFRP4E.groupAdvantageActions = [];
 
+WFRP4E.careerLevels = {
+    1 : 1,
+    2 : 2, 
+    3 : 3,
+    4 : 4,
+    5 : 5
+}
+
 WFRP4E.PrepareSystemItems = function() {
 
     this.systemItems = foundry.utils.mergeObject(this.systemItems, {
@@ -2750,6 +2758,7 @@ WFRP4E.scriptTriggers = {
     "preUpdate" : "Pre Update",
     "update" : "On Update",
     "equipToggle" : "Equip Toggle",
+    "targeted" : "Targeted",
     "prePrepareData" : "Pre-Prepare Data",
     "prePrepareItems" : "Pre-Prepare Actor Items",
     "prepareData" : "Prepare Data",

src/wfrp4e.js

@@ -69,10 +69,7 @@ import { OpposedTestMessage } from "./model/message/opposed-result.js";
 import { OpposedHandlerMessage } from "./model/message/oppose-handler.js";
 import  OpposedHandler from "./system/opposed-handler.js";
 import CombatHelpersWFRP from "./system/combat.js";
-import ActorSheetWFRP4eCharacterV2 from "./sheets/actor/character-sheet.js";
 import { GenericAspectModel } from "./model/item/generic.js";
-import ActorSheetWFRP4eNPCV2 from "./sheets/actor/npc-sheet.js";
-import ActorSheetWFRP4eCreatureV2 from "./sheets/actor/creature-sheet.js";
 import TalentSheet from "./sheets/item/talent-sheet.js";
 import MutationSheet from "./sheets/item/mutation-sheet.js";
 import CriticalSheet from "./sheets/item/critical-sheet.js";
@@ -97,7 +94,6 @@ import VehicleTestSheet from "./sheets/item/vehicleTest-sheet.js";
 import WeaponSheet from "./sheets/item/weapon-sheet.js";
 import { TemplateModel } from "./model/item/template.js";
 import TemplateSheet from "./sheets/item/template-sheet.js";
-import ActorSheetWFRP4eVehicleV2 from "./sheets/actor/vehicle-sheet.js";
 import ChatMessageWFRP from "./documents/message.js";
 import calendar from "./system/calendar.js";
 import ItemWFRP4e from "./documents/item.js";
@@ -126,10 +122,10 @@ Hooks.once("init", function () {
   const actorClass = CONFIG.Actor.documentClass;
   const itemClass = CONFIG.Item.documentClass;
   DocumentSheetConfig.unregisterSheet(actorClass, "core", foundry.appv1.sheets.ActorSheet);
-  DocumentSheetConfig.registerSheet(actorClass, "wfrp4e", ActorSheetWFRP4eCharacterV2, { types: ["character"], makeDefault: true, label : "SHEET.CharacterSheet" });
-  DocumentSheetConfig.registerSheet(actorClass, "wfrp4e", ActorSheetWFRP4eNPCV2, { types: ["npc"], makeDefault: true, label : "SHEET.NPCSheet"});
-  DocumentSheetConfig.registerSheet(actorClass, "wfrp4e", ActorSheetWFRP4eCreatureV2, { types: ["creature"], makeDefault: true, label : "SHEET.CreatureSheet"});
-  DocumentSheetConfig.registerSheet(actorClass, "wfrp4e", ActorSheetWFRP4eVehicleV2, { types: ["vehicle"], makeDefault: true, label : "SHEET.VehicleSheet" });
+  DocumentSheetConfig.registerSheet(actorClass, "wfrp4e", ActorSheetWFRP4eCharacter, { types: ["character"], makeDefault: true, label : "SHEET.CharacterSheet" });
+  DocumentSheetConfig.registerSheet(actorClass, "wfrp4e", ActorSheetWFRP4eNPC, { types: ["npc"], makeDefault: true, label : "SHEET.NPCSheet"});
+  DocumentSheetConfig.registerSheet(actorClass, "wfrp4e", ActorSheetWFRP4eCreature, { types: ["creature"], makeDefault: true, label : "SHEET.CreatureSheet"});
+  DocumentSheetConfig.registerSheet(actorClass, "wfrp4e", ActorSheetWFRP4eVehicle, { types: ["vehicle"], makeDefault: true, label : "SHEET.VehicleSheet" });
 
   DocumentSheetConfig.unregisterSheet(itemClass, "core", foundry.appv1.sheets.ItemSheet);
   DocumentSheetConfig.registerSheet(itemClass, "wfrp4e", AmmunitionSheet, { types: ["ammunition"], makeDefault: true });

static/templates/sheets/actor/character/character-notes.hbs

@@ -62,7 +62,7 @@
 
     <div class="experience-log">
 
-    <div class="header centered">{{localize "SHEET.ExperienceLog"}}</div>
+    <div class="sheet-list-header centered">{{localize "SHEET.ExperienceLog"}}</div>
     {{#if experienceLog.length}}
         <div class="sheet-list exp condensed">
             <div class="list-header row-content">

static/ui/backgrounds/actor-sheet-v2.webp

@@ -4,19 +4,18 @@
     section.tab[data-tab="notes"] {
         height: calc(100% - 200px);
 
-        .experience-log {
-            .header {
+        .sheet-list-header {
                 background: var(--experience-header);
                 border: 1px solid var(--experience-header-border);
                 border-bottom: 0px;
                 height: 1.5rem;
                 line-height: 1.5rem;
                 width: 100%;
                 padding-left: 5px;
-            }
-            .sheet-list {
-                margin-top: 0px;
-            }
+
+        }
+        .sheet-list {
+            margin-top: 0px;
         }
     }
 

style/sheets/actors/tabs/_notes.scss

@@ -307,14 +307,12 @@
             }
         }
 
-        section.tab[data-tab=notes] .experience-log {
-            .header {
+        section.tab[data-tab=notes] .sheet-list-header {
                 @include shadowed(#6b3a0f87);
                 color: var(--color-grey2);
                 background: none;
                 border: 1px solid var(--color-faded);
                 border-bottom: none;
-            }
         }
 
         .overview-content {

style/theme/_actor.scss

@@ -169,7 +169,10 @@
 
             input {
                 color: var(--color-grey1);
-                background: rgba(0, 0, 0, 0.05)
+                &:not([type=checkbox])
+                {
+                    background: rgba(0, 0, 0, 0.05)
+                }
             }
 
             select {
@@ -226,6 +229,15 @@
             }
         }
 
+
+        .sheet-button {
+            @include styled-button();
+            height: 1.5rem;
+            padding: 0px 6px;
+            line-height: 1.5rem;
+            min-height: 1.5rem;
+        }
+
         .sheet-effect-buttons {
             gap: 0.5rem;
             button {