Added generic actorUsesActionFeature function to the actions script.

Added useActionsFeature boolean to all actor sheet contexts. Limited presence of action filter override control to when useActionsFeature is true. Added Action Filter Override and Clear Override options to context menu.
kgar · Nov 25, 2023 · 9c2dcec · 9c2dcec
1 parent 5ae14d2
commit 9c2dcec
Show file tree

Hide file tree

Showing 15 changed files with 94 additions and 24 deletions.
diff --git a/public/lang/en.json b/public/lang/en.json
@@ -40,7 +40,8 @@
     "OverriddenSetOverrideFalse": "Remove from Actions List (Shift+Click to clear override)",
     "OverriddenSetOverrideTrue": "Add to Actions List (Shift+Click to clear override)",
     "SetOverrideFalse": "Remove from Actions List",
-    "SetOverrideTrue": "Add to Actions List"
+    "SetOverrideTrue": "Add to Actions List",
+    "ClearOverride": "Clear Action Override"
   },
 
   "T5EK.HitDC": "Hit / DC",

diff --git a/src/actions/actions.ts b/src/actions/actions.ts
@@ -1,3 +1,4 @@
+import { CONSTANTS } from 'src/constants';
 import { FoundryAdapter } from 'src/foundry/foundry-adapter';
 import { SettingsProvider } from 'src/settings/settings';
 import type { Item5e } from 'src/types/item';
@@ -202,3 +203,33 @@ export const damageTypeIconMap: Record<string, string> = {
   healing: '<i class="fas fa-heart"></i>',
   temphp: '<i class="fas fa-shield-alt"></i>',
 };
+
+export function actorUsesActionFeature(actor: Actor5e) {
+  const selectedTabIds = FoundryAdapter.tryGetFlag<string[] | undefined>(
+    actor,
+    'selected-tabs'
+  );
+
+  if (selectedTabIds) {
+    return selectedTabIds.includes(CONSTANTS.TAB_ACTOR_ACTIONS);
+  }
+
+  const defaultTabIds =
+    actor.type === CONSTANTS.SHEET_TYPE_CHARACTER
+      ? SettingsProvider.settings.defaultCharacterSheetTabs.get()
+      : actor.type === CONSTANTS.SHEET_TYPE_NPC
+      ? SettingsProvider.settings.defaultNpcSheetTabs.get()
+      : actor.type === CONSTANTS.SHEET_TYPE_VEHICLE
+      ? SettingsProvider.settings.defaultVehicleSheetTabs.get()
+      : [];
+
+  return defaultTabIds.includes(CONSTANTS.TAB_ACTOR_ACTIONS);
+}
+
+export function toggleActionFilterOverride(item: Item5e) {
+  FoundryAdapter.setFlag(
+    item,
+    'action-filter-override',
+    !isItemInActionList(item)
+  );
+}
diff --git a/src/components/item-list/controls/ActionFilterOverrideControl.svelte b/src/components/item-list/controls/ActionFilterOverrideControl.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { Item5e } from 'src/types/item';
   import ItemControl from './ItemControl.svelte';
-  import { isItemInActionList } from 'src/actions/actions';
+  import { isItemInActionList, toggleActionFilterOverride } from 'src/actions/actions';
   import { FoundryAdapter } from 'src/foundry/foundry-adapter';
 
   export let item: Item5e;
@@ -33,5 +33,5 @@
   on:click={(ev) =>
     ev.shiftKey
       ? FoundryAdapter.unsetFlag(item, 'action-filter-override')
-      : FoundryAdapter.toggleActionFilterOverride(item)}
+      : toggleActionFilterOverride(item)}
 />
diff --git a/src/components/spellbook/SpellbookList.svelte b/src/components/spellbook/SpellbookList.svelte
@@ -185,7 +185,9 @@
                 <ItemDuplicateControl item={spell} />
                 <ItemDeleteControl item={spell} />
               {/if}
-              <ActionFilterOverrideControl item={spell} />
+              {#if $context.useActionsFeature}
+                <ActionFilterOverrideControl item={spell} />
+              {/if}
             </ItemControls>
           </ItemTableCell>
         {/if}

diff --git a/src/context-menu/tidy5e-context-menu.ts b/src/context-menu/tidy5e-context-menu.ts
@@ -1,3 +1,8 @@
+import {
+  actorUsesActionFeature,
+  isItemInActionList,
+  toggleActionFilterOverride,
+} from 'src/actions/actions';
 import { CONSTANTS } from 'src/constants';
 import { FoundryAdapter } from 'src/foundry/foundry-adapter';
 import { SettingsProvider } from 'src/settings/settings';
@@ -301,5 +306,32 @@ function getItemContextOptions(item: Item5e) {
       });
     }
   }
+
+  if (actorUsesActionFeature(actor)) {
+    const active = isItemInActionList(item);
+    options.push({
+      name: active
+        ? 'T5EK.Actions.SetOverrideFalse'
+        : 'T5EK.Actions.SetOverrideTrue',
+      icon: active
+        ? '<i class="fas fa-fist-raised" style="color: var(--t5ek-warning-accent-color)"></i>'
+        : '<i class="fas fa-fist-raised"></i>',
+      callback: () => {
+        toggleActionFilterOverride(item);
+      },
+    });
+
+    const overridden =
+      FoundryAdapter.tryGetFlag(item, 'action-filter-override') !== undefined;
+    if (overridden) {
+      options.push({
+        name: 'T5EK.Actions.ClearOverride',
+        icon: '<i class="fas fa-fist-raised" style="color: var(--t5ek-warning-accent-color)"></i>',
+        callback: () => {
+          FoundryAdapter.unsetFlag(item, 'action-filter-override');
+        },
+      });
+    }
+  }
   return options;
 }
diff --git a/src/foundry/foundry-adapter.ts b/src/foundry/foundry-adapter.ts
@@ -1116,11 +1116,4 @@ export const FoundryAdapter = {
       ? FoundryAdapter.localize('DND5E.ActionOther')
       : game.dnd5e.config.abilityActivationTypes[activationType];
   },
-  toggleActionFilterOverride(item: Item5e) {
-    FoundryAdapter.setFlag(
-      item,
-      'action-filter-override',
-      !isItemInActionList(item)
-    );
-  },
 };
diff --git a/src/sheets/Tidy5eCharacterSheet.ts b/src/sheets/Tidy5eCharacterSheet.ts
@@ -22,7 +22,7 @@ import type { SvelteComponent } from 'svelte';
 import { getPercentage } from 'src/utils/numbers';
 import type { ItemChatData } from 'src/types/item';
 import { registeredCharacterTabs } from 'src/runtime/character-sheet-state';
-import { getActorActions } from 'src/actions/actions';
+import { actorUsesActionFeature, getActorActions } from 'src/actions/actions';
 
 export class Tidy5eCharacterSheet
   extends dnd5e.applications.actor.ActorSheet5eCharacter
@@ -183,9 +183,6 @@ export class Tidy5eCharacterSheet
           relativeTo: this.actor,
         }
       ),
-      useClassicControls:
-        SettingsProvider.settings.useClassicControlsForCharacter.get(),
-      useJournalTab: SettingsProvider.settings.useJournalTabForCharacter.get(),
       editable,
       features: sections,
       flawEnrichedHtml: await FoundryAdapter.enrichHtml(
@@ -290,6 +287,10 @@ export class Tidy5eCharacterSheet
           relativeTo: this.actor,
         }
       ),
+      useActionsFeature: actorUsesActionFeature(this.actor),
+      useClassicControls:
+        SettingsProvider.settings.useClassicControlsForCharacter.get(),
+      useJournalTab: SettingsProvider.settings.useJournalTabForCharacter.get(),
       useRoundedPortraitStyle: [
         CONSTANTS.CIRCULAR_PORTRAIT_OPTION_ALL as string,
         CONSTANTS.CIRCULAR_PORTRAIT_OPTION_CHARACTER as string,

diff --git a/src/sheets/Tidy5eKgarVehicleSheet.ts b/src/sheets/Tidy5eKgarVehicleSheet.ts
@@ -19,7 +19,7 @@ import { debug } from 'src/utils/logging';
 import { getPercentage } from 'src/utils/numbers';
 import type { ItemChatData } from 'src/types/item';
 import { registeredVehicleTabs } from 'src/runtime/vehicle-sheet-state';
-import { getActorActions } from 'src/actions/actions';
+import { actorUsesActionFeature, getActorActions } from 'src/actions/actions';
 
 export class Tidy5eVehicleSheet
   extends dnd5e.applications.actor.ActorSheet5eVehicle
@@ -128,6 +128,7 @@ export class Tidy5eVehicleSheet
       owner: this.actor.isOwner,
       showLimitedSheet: FoundryAdapter.showLimitedSheet(this.actor),
       tabs: [],
+      useActionsFeature: actorUsesActionFeature(this.actor),
       useRoundedPortraitStyle: [
         CONSTANTS.CIRCULAR_PORTRAIT_OPTION_ALL as string,
         CONSTANTS.CIRCULAR_PORTRAIT_OPTION_NPCVEHICLE as string,

diff --git a/src/sheets/Tidy5eNpcSheet.ts b/src/sheets/Tidy5eNpcSheet.ts
@@ -23,7 +23,7 @@ import LongRestDialog from 'src/dialogs/NpcLongRestDialog';
 import type { SvelteComponent } from 'svelte';
 import type { ItemChatData } from 'src/types/item';
 import { registeredNpcTabs } from 'src/runtime/npc-sheet-state';
-import { getActorActions } from 'src/actions/actions';
+import { actorUsesActionFeature, getActorActions } from 'src/actions/actions';
 
 export class Tidy5eNpcSheet
   extends dnd5e.applications.actor.ActorSheet5eNPC
@@ -285,6 +285,7 @@ export class Tidy5eNpcSheet
           relativeTo: this.actor,
         }
       ),
+      useActionsFeature: actorUsesActionFeature(this.actor),
       useJournalTab: SettingsProvider.settings.useJournalTabForNpc.get(),
       useRoundedPortraitStyle: [
         CONSTANTS.CIRCULAR_PORTRAIT_OPTION_ALL as string,
@@ -306,8 +307,7 @@ export class Tidy5eNpcSheet
           (a, b) => selectedTabs.indexOf(a.id) - selectedTabs.indexOf(b.id)
         );
     } else {
-      const defaultTabs =
-        SettingsProvider.settings.defaultNpcSheetTabs.get();
+      const defaultTabs = SettingsProvider.settings.defaultNpcSheetTabs.get();
       tabs = tabs
         .filter((t) => defaultTabs?.includes(t.id))
         .sort((a, b) => defaultTabs.indexOf(a.id) - defaultTabs.indexOf(b.id));

diff --git a/src/sheets/character/parts/InventoryList.svelte b/src/sheets/character/parts/InventoryList.svelte
@@ -173,7 +173,9 @@
                 <ItemDuplicateControl {item} />
                 <ItemDeleteControl {item} />
               {/if}
-              <ActionFilterOverrideControl {item} />
+              {#if $context.useActionsFeature}
+                <ActionFilterOverrideControl {item} />
+              {/if}
             </ItemControls>
           </ItemTableCell>
         {/if}

diff --git a/src/sheets/character/tabs/CharacterFeaturesTab.svelte b/src/sheets/character/tabs/CharacterFeaturesTab.svelte
@@ -232,7 +232,9 @@
                     <ItemDuplicateControl {item} />
                     <ItemDeleteControl {item} />
                   {/if}
-                  <ActionFilterOverrideControl {item} />
+                  {#if $context.useActionsFeature}
+                    <ActionFilterOverrideControl {item} />
+                  {/if}
                 </ItemTableCell>
               {/if}
             </ItemTableRow>

diff --git a/src/sheets/npc/tabs/NpcAbilitiesTab.svelte b/src/sheets/npc/tabs/NpcAbilitiesTab.svelte
@@ -156,7 +156,9 @@
                       <ItemDuplicateControl {item} />
                       <ItemDeleteControl {item} />
                     {/if}
-                    <ActionFilterOverrideControl {item} />
+                    {#if $context.useActionsFeature}
+                      <ActionFilterOverrideControl {item} />
+                    {/if}
                   </ItemControls>
                 </ItemTableCell>
               {/if}

diff --git a/src/sheets/vehicle/tabs/VehicleAttributesTab.svelte b/src/sheets/vehicle/tabs/VehicleAttributesTab.svelte
@@ -231,7 +231,9 @@
                         <ItemDuplicateControl {item} />
                         <ItemDeleteControl {item} />
                       {/if}
-                      <ActionFilterOverrideControl {item} />
+                      {#if $context.useActionsFeature}
+                        <ActionFilterOverrideControl {item} />
+                      {/if}
                     </ItemControls>
                   </ItemTableCell>
                 {/if}

diff --git a/src/sheets/vehicle/tabs/VehicleCargoAndCrewTab.svelte b/src/sheets/vehicle/tabs/VehicleCargoAndCrewTab.svelte
@@ -236,7 +236,7 @@
                     />
                   {/if}
 
-                  {#if $context.editable && !section.editableName}
+                  {#if $context.editable && !section.editableName && $context.useActionsFeature}
                     <ActionFilterOverrideControl {item} />
                   {/if}
                 </ItemControls>

diff --git a/src/types/types.ts b/src/types/types.ts
@@ -123,6 +123,7 @@ export type ActorSheetContext = {
   owner: boolean;
   showLimitedSheet: boolean;
   tabs: Tab[];
+  useActionsFeature?: boolean;
   useClassicControls: boolean;
   useRoundedPortraitStyle: boolean;
 } & JQueryHooksSheetIntegration &