add self apply icon, apply tooltips, other fixes

Author: moo-man

src/apps/script-editor.js

@@ -27,7 +27,7 @@ export default class WarhammerScriptEditor extends HandlebarsApplicationMixin(Ap
     };
 
     static PARTS = {
-        choices : {template : "modules/warhammer-lib/templates/scripts/script-config-v2.hbs"}
+        choices : {template : "modules/warhammer-lib/templates/scripts/script-editor.hbs"}
     };
 
     constructor(document, options)

src/document/effect.js

@@ -481,7 +481,7 @@ export default class WarhammerActiveEffect extends CONFIG.ActiveEffect.documentC
 
     get baseName() 
     {
-        return (/^(?<base>.+?)[[|(<](?<specifier>.+?)[\]|)>]$/gm).exec(this.name)?.groups.base.trim();
+        return (/^(?<base>.+?)[[|(<](?<specifier>.+?)[\]|)>]$/gm).exec(this.name)?.groups.base.trim() || this.name;;
     }
 
     get isCondition() 

src/sheets/effect.js

@@ -29,6 +29,8 @@ export default class WarhammerActiveEffectConfig extends WarhammerSheetMixin(Act
         // Replace transfer field with Effect Application data (used to derive transfer value)
         this.element.find("[name='transfer']").parents(".form-group").replaceWith(transferDataHTML);
 
+        this.element.find("[name='statuses']").parents(".form-group").remove();
+
         // // Replace attribute key field with a select field
         let effectsTab = this.element.find("section[data-tab='effects']");
 

static/lang/en.json

@@ -160,6 +160,12 @@
             "Zone" : "Zone",
             "Other" : "Other"
         },
+        "ApplyTooltips" : {
+            "Self" : "Applies the Effect to the source Actor",
+            "Target" : "Applies the Effect to the targets of the action or the tokens currently targeted.",
+            "Area" : "Place an Area Template for the Effect, applying to tokens within.",
+            "Zone" : "Select a Zone to apply this Effect to, applying to tokens within."
+        },
         "Dialog.Modifiers": "Dialog Modifiers",
         "Dialog.UserEntry": "User Entry",
         "Dialog.Initial": "Initial",

static/templates/partials/effect-buttons.hbs

@@ -1,23 +1,27 @@
 {{#if targetEffects.length}}
     <div class="test-buttons">
         {{#each targetEffects as |effect e|}}
-            <button class="apply-target" data-uuid="{{effect.uuid}}" type="button"><i class="fa-solid fa-crosshairs"></i><img src="{{effect.img}}" width="25" height="25"> <p>{{localize 'WH.ApplyEffect' name=effect.name}}{{#if effect.testDisplay}}<br><span class="test-label">{{effect.testDisplay}}</span>{{/if}}</p></button>
+        {{#if effect.system.transferData.selfOnly}}
+            <button class="apply-target" data-uuid="{{effect.uuid}}" type="button"><i data-tooltip="WH.ApplyTooltips.Self" data-tooltip-direction="LEFT" class="fa-solid fa-person-rays"></i><img src="{{effect.img}}" width="25" height="25"> <p>{{localize 'WH.ApplyEffect' name=effect.name}}{{#if effect.testDisplay}}<br><span class="test-label">{{effect.testDisplay}}</span>{{/if}}</p></button>
+        {{else}}
+            <button class="apply-target" data-uuid="{{effect.uuid}}" type="button"><i data-tooltip="WH.ApplyTooltips.Target" data-tooltip-direction="LEFT" class="fa-solid fa-crosshairs"></i><img src="{{effect.img}}" width="25" height="25"> <p>{{localize 'WH.ApplyEffect' name=effect.name}}{{#if effect.testDisplay}}<br><span class="test-label">{{effect.testDisplay}}</span>{{/if}}</p></button>
+        {{/if}}
         {{/each}}
     </div>
 {{/if}}
 
 {{#if areaEffects.length}}
     <div class="test-buttons">
         {{#each areaEffects as |effect e|}}
-            <button class="place-area" data-uuid={{effect.uuid}} type="button"><i class="fa-solid fa-ruler-combined"></i><img src="{{effect.img}}" width="25" height="25"> {{localize "WH.PlaceEffect" name=effect.name}}{{#if effect.testDisplay}}<br><span class="test-label">{{effect.testDisplay}}</span>{{/if}}</p></button>
+            <button class="place-area" data-uuid={{effect.uuid}} type="button"><i data-tooltip="WH.ApplyTooltips.Area" data-tooltip-direction="LEFT" class="fa-solid fa-ruler-combined"></i><img src="{{effect.img}}" width="25" height="25"> {{localize "WH.PlaceEffect" name=effect.name}}{{#if effect.testDisplay}}<br><span class="test-label">{{effect.testDisplay}}</span>{{/if}}</p></button>
         {{/each}}
     </div>
 {{/if}}
 
 {{#if zoneEffects.length}}
     <div class="test-buttons">
         {{#each zoneEffects as |effect e|}}
-            <button class="place-zone" data-uuid={{effect.uuid}} type="button"><i class="fa-solid fa-game-board-simple"></i><img src="{{effect.img}}" width="25" height="25"> {{localize "WH.PlaceEffect" name=effect.name}}{{#if effect.testDisplay}}<br><span class="test-label">{{effect.testDisplay}}</span>{{/if}}</p></button>
+            <button class="place-zone" data-uuid={{effect.uuid}} type="button"><i data-tooltip="WH.ApplyTooltips.Zone" data-tooltip-direction="LEFT" class="fa-solid fa-game-board-simple"></i><img src="{{effect.img}}" width="25" height="25"> {{localize "WH.PlaceEffect" name=effect.name}}{{#if effect.testDisplay}}<br><span class="test-label">{{effect.testDisplay}}</span>{{/if}}</p></button>
         {{/each}}
     </div>
 {{/if}}