Dnd5e 2.4.x Compatibility Release 1

prepare-dist-for-dev.js

@@ -33,6 +33,8 @@ function prepareDistForDev() {
   fs.writeFileSync(path.join(distFolder, 'main.js'), `// ${message}`);
 
   fs.writeFileSync(path.join(distFolder, 'style.css'), `/* ${message} */`);
+
+  fs.writeFileSync(path.join(distFolder, 'tidy5e-sheet-kgar.lock'), "🔒");
 }
 
 prepareDistForDev();

public/lang/en.json

@@ -86,6 +86,7 @@
   "T5EK.Abilities": "Abilities",
 
   "T5EK.Environment": "Environment",
+  "T5EK.EnvironmentTooltip": "Environment: {environment}",
 
   "T5EK.Search": "search",
   "T5EK.SearchClear": "clear search",

public/module.json

@@ -99,9 +99,9 @@
       {
         "id": "dnd5e",
         "compatibility": {
-          "minimum": "2.3.0",
-          "verified": "2.3.1",
-          "maximum": "2.3.1"
+          "minimum": "2.4.0",
+          "verified": "2.4.0",
+          "maximum": "2.4.0"
         }
       }
     ],

public/templates/tidy5e-origin-summary-config.hbs

@@ -1,25 +1,32 @@
 <form>
   {{#if isCharacter}}
 
-    <div class='form-group'>
-      <label>{{localize 'DND5E.Race'}}</label>
-      <textarea
-        rows='4'
-        cols='50'
-        name='race'
-        value='{{race}}'
-        placeholder='{{localize "DND5E.Race"}}'
-      >{{race}}</textarea>
-    </div>
+    {{#if canEditRace}}
+      <div class='form-group'>
+        <label>{{localize 'DND5E.Race'}}</label>
+        <textarea
+          rows='4'
+          cols='50'
+          name='race'
+          value='{{race}}'
+          placeholder='{{localize "DND5E.Race"}}'
+        >{{race}}</textarea>
+
+      </div>
+    {{/if}}
     <div class='form-group'>
       <label>{{localize 'DND5E.Background'}}</label>
-      <textarea
-        rows='4'
-        cols='50'
-        name='background'
-        value='{{background}}'
-        placeholder='{{localize "DND5E.Background"}}'
-      >{{background}}</textarea>
+      {{#if canEditBackground}}
+        <textarea
+          rows='4'
+          cols='50'
+          name='background'
+          value='{{background}}'
+          placeholder='{{localize "DND5E.Background"}}'
+        >{{background}}</textarea>
+      {{else}}
+        <span>{{background}}</span>
+      {{/if}}
     </div>
     <div class='form-group'>
       <label>{{localize 'DND5E.Alignment'}}</label>
@@ -54,16 +61,6 @@
         placeholder='{{localize "DND5E.Alignment"}}'
       >{{alignment}}</textarea>
     </div>
-    <div class='form-group'>
-      <label>{{localize 'DND5E.Source'}}</label>
-      <textarea
-        rows='4'
-        cols='50'
-        name='source'
-        value='{{source}}'
-        placeholder='{{localize "DND5E.Source"}}'
-      >{{source}}</textarea>
-    </div>
 
   {{else if isVehicle}}
 

src/constants.ts

@@ -14,6 +14,7 @@ export const CONSTANTS = {
   ITEM_TYPE_SUBCLASS: 'subclass',
   ITEM_TYPE_TOOL: 'tool',
   ITEM_TYPE_WEAPON: 'weapon',
+  ITEM_TYPE_RACE: 'race',
   /**
    * Main button pressed, usually the left button or the un-initialized state
    */

src/context-menu/tidy5e-context-menu.ts

@@ -88,8 +88,8 @@ function getActiveEffectContextOptions(effect: any) {
         callback: () =>
           effect.clone(
             {
-              label: FoundryAdapter.localize('DOCUMENT.CopyOf', {
-                name: effect.label,
+              name: FoundryAdapter.localize('DOCUMENT.CopyOf', {
+                name: effect.name,
               }),
             },
             { save: true }

src/dialogs/Tidy5eActorOriginSummaryConfig.ts

@@ -42,16 +42,20 @@ export default class Tidy5eActorOriginSummaryConfig extends DocumentSheet {
   /** @inheritdoc */
   getData(options: any) {
     return {
-      race: this.clone.system.details.race,
-      background: this.clone.system.details.background,
+      race:
+        this.clone.system.details.race?.name ?? this.clone.system.details.race,
+      background:
+        this.clone.system.details.background?.name ??
+        this.clone.system.details.background,
       environment: this.clone.system.details.environment,
       alignment: this.clone.system.details.alignment,
-      source: this.clone.system.details.source,
       dimensions: this.clone.system.traits.dimensions,
 
       isCharacter: this.document.type === CONSTANTS.SHEET_TYPE_CHARACTER,
       isNPC: this.document.type === CONSTANTS.SHEET_TYPE_NPC,
       isVehicle: this.document.type === CONSTANTS.SHEET_TYPE_VEHICLE,
+      canEditBackground: !this.clone.system.details.background?.name,
+      canEditRace: !this.clone.system.details.race?.name,
     };
   }
 
@@ -61,7 +65,6 @@ export default class Tidy5eActorOriginSummaryConfig extends DocumentSheet {
     const background = FoundryAdapter.expandObject(formData).background;
     const environment = FoundryAdapter.expandObject(formData).environment;
     const alignment = FoundryAdapter.expandObject(formData).alignment;
-    const source = FoundryAdapter.expandObject(formData).source;
 
     const dimensions = FoundryAdapter.expandObject(formData).dimensions;
 
@@ -79,7 +82,6 @@ export default class Tidy5eActorOriginSummaryConfig extends DocumentSheet {
       return this.document.update({
         'system.details.environment': environment,
         'system.details.alignment': alignment,
-        'system.details.source': source,
       });
     } else if (isVehicle) {
       return this.document.update({

src/foundry/foundry-adapter.ts

@@ -171,12 +171,14 @@ export const FoundryAdapter = {
   getActorCharacterSummaryEntries(actorContext: any): string[] {
     const entries: string[] = [];
 
-    if (actorContext.system.details.race) {
+    if (actorContext.system.details.race?.name) {
+      entries.push(actorContext.system.details.race.name);
+    } else if (actorContext.system.details.race) {
       entries.push(actorContext.system.details.race);
     }
 
-    if (actorContext.labels.background) {
-      entries.push(actorContext.labels.background);
+    if (actorContext.system.details.background?.name) {
+      entries.push(actorContext.system.details.background.name);
     } else if (actorContext.system.details.background) {
       entries.push(actorContext.system.details.background);
     }
@@ -578,13 +580,11 @@ export const FoundryAdapter = {
   registerActorSheet(sheet: any, types: string[], label: string) {
     Actors.registerSheet(CONSTANTS.DND5E_SYSTEM_ID, sheet, {
       types,
-      makeDefault: true,
       label,
     });
   },
   registerItemSheet(sheet: any, label: string) {
     Items.registerSheet(CONSTANTS.DND5E_SYSTEM_ID, sheet, {
-      makeDefault: true,
       label,
     });
   },
@@ -893,6 +893,18 @@ export const FoundryAdapter = {
   openActorTypeConfig(actor: Actor5e) {
     return new dnd5e.applications.actor.ActorTypeConfig(actor).render(true);
   },
+  openCharacterActorTypeConfig(actor: Actor5e) {
+    if (actor.system.details.race?.id) {
+      return new dnd5e.applications.actor.ActorTypeConfig(
+        actor.system.details.race,
+        { keyPath: 'system.type' }
+      ).render(true);
+    }
+
+    warn(
+      'Unable to open actor type config for player character because they do not have a race.'
+    );
+  },
   playDiceSound() {
     return AudioHelper.play({ src: CONFIG.sounds.dice });
   },
@@ -939,49 +951,6 @@ export const FoundryAdapter = {
   createContextMenu(...args: any[]): any {
     return new ContextMenu(...args);
   },
-  renderClassItemTraitSelector(
-    item: any,
-    target: string,
-    title: string,
-    trait: 'saves' | 'skills.choices' | 'skills'
-  ) {
-    const options: Record<string, unknown> = {
-      name: target,
-      title,
-      choices: [],
-      allowCustom: false,
-      suppressWarning: true,
-    };
-    switch (trait) {
-      case 'saves':
-        options.choices = CONFIG.DND5E.abilities;
-        options.valueKey = null;
-        options.labelKey = 'label';
-        break;
-      case 'skills.choices':
-        options.choices = CONFIG.DND5E.skills;
-        options.valueKey = null;
-        options.labelKey = 'label';
-        break;
-      case 'skills':
-        const skills = item.system.skills;
-        const choices = skills.choices?.length
-          ? skills.choices
-          : Object.keys(CONFIG.DND5E.skills);
-        options.choices = Object.fromEntries(
-          Object.entries(CONFIG.DND5E.skills).filter(([s]) =>
-            choices.includes(s)
-          )
-        );
-        options.maximum = skills.number;
-        options.labelKey = 'label';
-        break;
-    }
-
-    return new game.dnd5e.applications.TraitSelector(item, options).render(
-      true
-    );
-  },
   createAdvancementSelectionDialog(item: any) {
     return game.dnd5e.applications.advancement.AdvancementSelection.createDialog(
       item
@@ -1075,4 +1044,24 @@ export const FoundryAdapter = {
       key,
     }).render(true);
   },
+  renderItemTypeConfig(item: any) {
+    return new dnd5e.applications.actor.ActorTypeConfig(item, {
+      keyPath: 'system.type',
+    }).render(true);
+  },
+  renderItemMovementConfig(item: any) {
+    return new dnd5e.applications.actor.ActorMovementConfig(item, {
+      keyPath: 'system.movement',
+    }).render(true);
+  },
+  renderItemSensesConfig(item: any) {
+    return new dnd5e.applications.actor.ActorSensesConfig(item, {
+      keyPath: 'system.senses',
+    }).render(true);
+  },
+  renderSourceConfig(document: any, keyPath: string) {
+    return new dnd5e.applications.SourceConfig(document, {
+      keyPath,
+    }).render(true);
+  },
 };

src/scss/core.scss

@@ -108,7 +108,7 @@
     margin: unset;
   }
 
-  .highlight-on-hover:hover {
+  .highlight-on-hover:is(:hover, :focus-visible) {
     color: var(--t5ek-primary-accent-color);
   }
 

src/scss/partials/_items.scss

@@ -120,6 +120,7 @@ input[type='checkbox'] {
 
   .header-details {
     align-items: center;
+    min-width: 0; // needed for flex children that truncate overflow
   }
 
   .charname {
@@ -186,7 +187,13 @@ input[type='checkbox'] {
       border-left: 0.0625rem solid var(--t5ek-faint-color);
       line-height: 1.25rem;
       font-weight: 600;
+      min-width: 0; // needed for flex children that truncate overflow
+      padding-left: 0.325rem;
 
+      &:has(> input, > select) {
+        padding: 0;
+      }
+
       input {
         height: 1.25rem;
         background: transparent;
@@ -201,6 +208,7 @@ input[type='checkbox'] {
 
       &:first-child {
         border: none;
+        padding-left: 0;
       }
 
       &:last-child {
@@ -242,6 +250,15 @@ input[type='checkbox'] {
 
     .properties-header {
       margin-top: 0.25rem;
+
+      .hidden-config-button {
+        visibility: hidden;
+        font-size: 0.75rem;
+      }
+
+      &:hover .hidden-config-button {
+        visibility: visible;
+      }
     }
 
     .properties-list {

src/sheets/Tidy5eItemSheet.ts

@@ -14,6 +14,7 @@ import SpellSheet from './item/SpellSheet.svelte';
 import SubclassSheet from './item/SubclassSheet.svelte';
 import ToolSheet from './item/ToolSheet.svelte';
 import WeaponSheet from './item/WeaponSheet.svelte';
+import RaceSheet from './item/RaceSheet.svelte';
 import type { SheetStats, SheetTabCacheable } from 'src/types/types';
 import { applyTitleToWindow } from 'src/utils/applications';
 import { debug } from 'src/utils/logging';
@@ -134,6 +135,12 @@ export class Tidy5eKgarItemSheet
           context: context,
         });
         break;
+      case CONSTANTS.ITEM_TYPE_RACE:
+        this.component = new RaceSheet({
+          target: node,
+          context: context,
+        });
+        break;
       default:
         this.component = new TypeNotFoundSheet({
           target: node,

src/sheets/actor/ActorEffectsTab.svelte

@@ -63,7 +63,7 @@
             >
               <ItemTableCell primary={true}>
                 <ItemImage src={effect.icon} />
-                <span class="align-self-center">{effect.label}</span>
+                <span class="align-self-center">{effect.name}</span>
               </ItemTableCell>
               <ItemTableCell baseWidth="12.5rem"
                 >{effect.sourceName ?? ''}</ItemTableCell

src/sheets/actor/AttributeBlock.svelte

@@ -173,6 +173,7 @@
       height: 1.0625rem; // This is far too precise; can we make this more relative to its target?
       padding: 0.1875rem 0.25rem 0.125rem 0.25rem; // this padding is providing the positioning of the text. Can we do this in flexbox?
       white-space: nowrap;
+      z-index: 1;
 
       &.ability-mod-label {
         right: 1.5625rem; // This is far too precise; can we make this more relative to its target?