dnd5e: Compatibility pack 1

public/module.json

@@ -109,9 +109,9 @@
       {
         "id": "dnd5e",
         "compatibility": {
-          "minimum": "4.1.0",
-          "verified": "4.1.0",
-          "maximum": "4.1.x"
+          "minimum": "4.2.0",
+          "verified": "4.2.0",
+          "maximum": "4.2.x"
         }
       }
     ],

src/api/Tidy5eSheetsApi.ts

@@ -1109,7 +1109,8 @@ export class Tidy5eSheetsApi {
    * @returns the original HTML with a transparent element wrapped around which indicates to Tidy that this should be removed and re-rendered.
    *
    * @remarks
-   * The intended use of this function is to accompany the use of the `tidy5e-sheet.renderActorSheet` or `tidy5e-sheet.renderItemSheet` hook.
+   * The intended use of this function is to accompany the use of the `tidy5e-sheet.renderActorSheet` hook in App V1 (PCs, NPCs, Vehicles) 
+   * or the standard sheet render hooks in App V2 (Items, Containers, Groups).
    * Any content injected through those hooks needs to be wrapped in this way so that the old version
    * of the HTML can be removed before adding it back in.
    * Handlebars refreshes content in this way, but for Tidy purposes, the module needs to know when an arbitrary

src/applications/settings/world-settings/tabs/CustomSectionsWorldSettingsTab.svelte

@@ -53,7 +53,7 @@
     },
     {
       type: CONSTANTS.SHEET_TYPE_NPC,
-      label: localize('DND5E.NPC'),
+      label: localize('DND5E.NPC.Label'),
       tabs: mapTabs(NpcSheetRuntime.tabMap, [
         CONSTANTS.TAB_NPC_ABILITIES,
         CONSTANTS.TAB_ACTOR_INVENTORY,
@@ -90,7 +90,7 @@
     }
 
     return mappedTabs.sort((left, right) =>
-      left.title.localeCompare(right.title),
+      left.title.localeCompare(right.title, game.i18n.lang),
     );
   }
 

src/constants.ts

@@ -392,6 +392,7 @@ export const CONSTANTS = {
   SHEET_SETTINGS_OPTION_GM_AND_OWNERS: 'gm-and-owners',
   TEXT_EDITOR_ACTIVATION_ELEMENT_SELECTOR: '.editor-content[data-edit]',
   SKILL_KEY_PERCEPTION: 'prc',
+  TREASURE_ANY: 'any',
   SVELTE_CONTEXT: {
     ACCORDION_CONTEXT: 'accordionContext',
     APP_ID: 'appId',

src/features/conditions-and-effects/ConditionsAndEffects.ts

@@ -40,11 +40,15 @@ export class ConditionsAndEffects {
           const { id, name, img, disabled, duration } = effect;
           let source = (await effect.getSource()) ?? actor;
           // If the source is an ActiveEffect from another Actor, note the source as that Actor instead.
-          if (
-            source instanceof dnd5e.documents.ActiveEffect5e &&
-            source.target !== object
-          ) {
+          if (source instanceof ActiveEffect) {
             source = source.target;
+            if (
+              source instanceof Item &&
+              source.parent &&
+              source.parent !== object
+            ) {
+              source = source.parent;
+            }
           }
 
           arr = await arr;

src/features/sections/SheetSections.ts

@@ -535,7 +535,7 @@ export class SheetSections {
 
     return Array.from<string>(sectionSet)
       .filter((x) => !isNil(x, ''))
-      .toSorted((left, right) => left.localeCompare(right));
+      .toSorted((left, right) => left.localeCompare(right, game.i18n.lang));
   }
 
   static getFilteredGlobalSectionsToShowWhenEmpty(

src/foundry/TidyFlags.ts

@@ -926,35 +926,6 @@ export class TidyFlags {
     },
   };
 
-  /**
-   * Indicates whether the legendary toolbar should be shown for a given NPC.
-   */
-  static showLegendaryToolbar = {
-    key: 'showLegendaryToolbar' as const,
-    prop: TidyFlags.getFlagPropertyPath('showLegendaryToolbar'),
-    /** Gets whether the legendary toolbar should be shown for an NPC. */
-    get(actor: Actor5e): boolean | undefined {
-      return (
-        TidyFlags.tryGetFlag<boolean>(
-          actor,
-          TidyFlags.showLegendaryToolbar.key
-        ) ?? undefined
-      );
-    },
-    /** Sets whether the legendary toolbar should be shown for an NPC. */
-    set(actor: Actor5e, value: boolean): Promise<void> {
-      return TidyFlags.setFlag(
-        actor,
-        TidyFlags.showLegendaryToolbar.key,
-        value
-      );
-    },
-    /** Clears whether the legendary toolbar should be shown for an NPC. */
-    unset(actor: Actor5e) {
-      return TidyFlags.unsetFlag(actor, TidyFlags.showLegendaryToolbar.key);
-    },
-  };
-
   /**
    * Indicates whether the additional personality info should be shown
    * for a given NPC on the biography tab.

src/foundry/TidyHooks.ts

@@ -479,34 +479,6 @@ export class TidyHooks {
     Hooks.callAll('tidy5e-sheet.renderActorSheet', app, element, data, forced);
   }
 
-  /**
-   * The item sheet has rendered all content and registered custom content. Is called on partial and full renders.
-   * @param {any} app The target item sheet application class instance.
-   * @param {HTMLElement} element The item sheet's HTML element.
-   * @param {ContainerSheetClassicContext | ItemSheetContext} data The data context from `getData()`.
-   * @param {boolean} forced `true` when performing a full re-render; `false` when performing a partial re-render.
-   *
-   * @example
-   * ```js
-   * Hooks.on('tidy5e-sheet.renderItemSheet', (app, element, data, forced) => {
-   *   // Your code here
-   * });
-   * ```
-   *
-   * @deprecated This hook is now redundant for App V2 item and container sheets. It will be removed as of Tidy V8.
-   */
-  static tidy5eSheetsRenderItemSheet(
-    app: any,
-    element: HTMLElement,
-    data:
-      | ContainerSheetClassicContext
-      | ItemSheetContext
-      | ContainerSheetHightouchContext,
-    forced: boolean
-  ) {
-    Hooks.callAll('tidy5e-sheet.renderItemSheet', app, element, data, forced);
-  }
-
   /**
    * A tab has been selected on the sheet.
    * @param {any} app The sheet application instance.

src/foundry/config.types.ts

@@ -6,6 +6,42 @@ type CurrencyItemConfig = {
   conversion: number;
 };
 
+interface MovementUnitConfig {
+  label: string;
+  abbreviation: string;
+  conversion: number;
+  formattingUnit: string;
+  type: string;
+}
+
+interface IndividualTargetTypesConfig {
+  label: string;
+  scalar?: boolean;
+  counted: string;
+}
+
+interface RecoveryOption {
+  value: string;
+  label: string;
+  group?: string;
+}
+
+interface VolumeUnitConfig {
+  label: string;
+  abbreviation: string;
+  counted?: string;
+  conversion: number;
+  type: string;
+}
+
+interface TreasureConfig {
+  label: string;
+}
+
+interface CommunicationTypeConfig {
+  label: string;
+}
+
 export type CONFIG = {
   debug: {
     applications: boolean;
@@ -2493,6 +2529,9 @@ export type CONFIG = {
       cha: Dnd5eAbility;
     } & Record<string, Dnd5eAbility>;
     areaTargetOptions: GroupableSelectOption[];
+    communicationTypes: {
+      telepathy: CommunicationTypeConfig;
+    } & Record<string, CommunicationTypeConfig>;
     defaultAbilities: {
       meleeAttack: string;
       rangedAttack: string;
@@ -3241,6 +3280,7 @@ export type CONFIG = {
         abbreviation: string;
         formula: boolean;
       };
+      recoveryOptions: RecoveryOption[];
     };
     enchantmentPeriods: {
       sr: {
@@ -3738,10 +3778,10 @@ export type CONFIG = {
       walk: string;
     };
     movementUnits: {
-      ft: string;
-      mi: string;
-      m: string;
-      km: string;
+      ft: MovementUnitConfig;
+      mi: MovementUnitConfig;
+      m: MovementUnitConfig;
+      km: MovementUnitConfig;
     };
     rangeTypes: {
       self: string;
@@ -3844,16 +3884,16 @@ export type CONFIG = {
       };
     };
     individualTargetTypes: {
-      self: string;
-      ally: string;
-      enemy: string;
-      creature: string;
-      object: string;
-      space: string;
-      creatureOrObject: string;
-      any: string;
-      willing: string;
-    };
+      self: IndividualTargetTypesConfig;
+      ally: IndividualTargetTypesConfig;
+      enemy: IndividualTargetTypesConfig;
+      creature: IndividualTargetTypesConfig;
+      object: IndividualTargetTypesConfig;
+      space: IndividualTargetTypesConfig;
+      creatureOrObject: IndividualTargetTypesConfig;
+      any: IndividualTargetTypesConfig;
+      willing: IndividualTargetTypesConfig;
+    } & Record<string, IndividualTargetTypesConfig>;
     areaTargetTypes: {
       circle: {
         label: string;
@@ -5571,6 +5611,18 @@ export type CONFIG = {
         woodcarver: string;
       };
     };
+    treasure: {
+      any: TreasureConfig;
+      arcana: TreasureConfig;
+      armaments: TreasureConfig;
+      implements: TreasureConfig;
+      individual: TreasureConfig;
+      relics: TreasureConfig;
+    } & Record<string, TreasureConfig>;
+    volumeUnits: {
+      cubicFoot: VolumeUnitConfig;
+      liter: VolumeUnitConfig;
+    } & Record<string, VolumeUnitConfig>;
   };
 };
 

src/foundry/foundry-adapter.ts

@@ -34,7 +34,10 @@ export const FoundryAdapter = {
   getTidySetting<T = string>(settingName: string): T {
     return game.settings.get(CONSTANTS.MODULE_ID, settingName) as T;
   },
-  async setTidySetting(key: keyof CurrentSettings, value: unknown): Promise<void> {
+  async setTidySetting(
+    key: keyof CurrentSettings,
+    value: unknown
+  ): Promise<void> {
     await game.settings.set(CONSTANTS.MODULE_ID, key, value);
   },
   registerTidySetting(key: string, data: any): void {
@@ -202,11 +205,11 @@ export const FoundryAdapter = {
     if (event.button !== CONSTANTS.MOUSE_BUTTON_AUXILIARY) {
       return;
     }
-    
+
     if (!entityWithSheet.sheet.isEditable) {
       return;
     }
-    
+
     event.preventDefault();
     event.stopImmediatePropagation();
 
@@ -836,16 +839,8 @@ export const FoundryAdapter = {
     );
   },
   deleteAdvancement(advancementItemId: string, item: Item5e) {
-    if (item.isEmbedded && !game.settings.get('dnd5e', 'disableAdvancements')) {
-      let manager =
-        dnd5e.applications.advancement.AdvancementManager.forDeletedAdvancement(
-          item.actor,
-          item.id,
-          advancementItemId
-        );
-      if (manager.steps.length) return manager.render(true);
-    }
-    return item.deleteAdvancement(advancementItemId);
+    const advancement = item.advancement.byId[advancementItemId];
+    return advancement?.deleteDialog();
   },
   modifyAdvancementChoices(advancementLevel: string, item: Item5e) {
     let manager =
@@ -1447,4 +1442,28 @@ export const FoundryAdapter = {
         : FoundryAdapter.localize('DND5E.AbbreviationDC')
       : null;
   },
+  checkIfModernRules(document: any) {
+    return document.system.source?.rules
+      ? document.system.source?.rules === '2024'
+      : game.settings.get('dnd5e', 'rulesVersion') === 'modern';
+  },
+  prepareLanguageTrait(actor: any, traits: any) {
+    const languages = actor.system.traits?.languages?.labels;
+    if (languages?.languages?.length)
+      traits.languages = languages.languages.map((label: string) => ({
+        label,
+      }));
+    for (const [key, { label }] of Object.entries(
+      CONFIG.DND5E.communicationTypes
+    )) {
+      const data = actor.system.traits?.languages?.communication?.[key];
+      if (!data?.value) continue;
+      let value = data.value;
+      if (data.units) {
+        value += ` ${data.units}`;
+      }
+      traits.languages ??= [];
+      traits.languages.push({ label, value: value });
+    }
+  },
 };

src/integration/system/TidyCustomSectionsInDefaultItemSheetIntegration.ts

@@ -7,7 +7,7 @@ import { settings } from 'src/settings/settings.svelte';
 export class TidyCustomSectionsInDefaultItemSheetIntegration
   implements SystemIntegrationBase
 {
-  init(api: Tidy5eSheetsApi): void {
+  init(_: Tidy5eSheetsApi): void {
     Hooks.on('renderItemSheet5e', (app: any) => {
       const includeSectionFields =
         settings.value.includeTidySectionFieldsInDefaultSheets;

src/runtime/item/default-item-filters.ts

@@ -35,7 +35,7 @@ export const defaultItemFilters = {
       !!item.system.activities?.some(
         (a: any) => a.activation?.type === CONSTANTS.ACTIVATION_COST_LEGENDARY
       ),
-    text: 'DND5E.LegendaryActionLabel',
+    text: 'DND5E.LegendaryAction.Label',
   },
   activationCostMythic: {
     name: 'activationCostMythic',
@@ -51,7 +51,7 @@ export const defaultItemFilters = {
       !!item.system.activities?.some(
         (a: any) => a.activation?.type === CONSTANTS.ACTIVATION_COST_LAIR
       ),
-    text: 'DND5E.LairActionLabel',
+    text: 'DND5E.LAIR.Action.Label',
   },
   activationCostCrew: {
     name: 'activationCostCrew',