Fix regression editing NPC lore skills (foundryvtt#15290)

nikolaj-a · Jun 29, 2024 · c4ea68a · c4ea68a
1 parent eb157c8
commit c4ea68a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/module/actor/character/data.ts b/src/module/actor/character/data.ts
@@ -281,7 +281,7 @@ interface CharacterSkillData extends SkillData {
  /** Is this skill a Lore skill? */
  lore?: boolean;
  /** If this is a lore skill, what item it came from */
- itemID: string | null;
+ itemId: string | null;
 }
 
 interface CharacterAbilityData extends AbilityData {

diff --git a/src/module/actor/character/document.ts b/src/module/actor/character/document.ts
@@ -967,7 +967,7 @@ class CharacterPF2e<TParent extends TokenDocumentPF2e | null = TokenDocumentPF2e
  ...statistic.getTraceData(),
  rank: statistic.rank,
  armor: baseData.armor ?? false,
- itemID: loreItem?.id ?? null,
+ itemId: loreItem?.id ?? null,
  lore: !!statistic.lore,
  });
  return [key, data];

diff --git a/src/module/actor/npc/data.ts b/src/module/actor/npc/data.ts
@@ -248,7 +248,7 @@ interface NPCSkillData extends NPCSkillSource, AttributeBasedTraceData {
  /** Is this skill a Lore skill? */
  lore?: boolean;
  /** If this is a lore skill, what item it came from */
- itemID?: string;
+ itemId?: string;
  special: NPCSpecialSkill[];
 }
 

diff --git a/src/module/actor/npc/document.ts b/src/module/actor/npc/document.ts
@@ -386,7 +386,7 @@ class NPCPF2e<TParent extends TokenDocumentPF2e | null = TokenDocumentPF2e | nul
  const data = fu.mergeObject(baseData, {
  ...statistic.getTraceData(),
  mod: statistic.check.mod,
- itemID: loreItem?.id ?? null,
+ itemId: loreItem?.id ?? null,
  lore: !!statistic.lore,
  visible: statistic.proficient,
  });

diff --git a/static/templates/actors/character/tabs/proficiencies.hbs b/static/templates/actors/character/tabs/proficiencies.hbs
@@ -42,12 +42,12 @@
  {{!-- Lore Skills --}}
  {{#each data.skills as |skill idx|}}
  {{#if skill.lore}}
- <li class="item" data-item-id="{{skill.itemID}}" data-item-type="lore" data-statistic="{{skill.slug}}">
+ <li class="item" data-item-id="{{skill.itemId}}" data-item-type="lore" data-statistic="{{skill.slug}}">
  <a class="d20" data-action="roll-check" data-tooltip="{{skill.breakdown}}">
  {{> "systems/pf2e/templates/actors/character/icons/d20.hbs"}}
  </a>
  <a class="modifier" data-action="roll-check">{{numberFormat skill.value decimals=0 sign=true}}</a>
- <input class="name" data-item-id="{{skill.itemID}}" data-item-property="name" type="text" value="{{skill.label}}" />
+ <input class="name" data-item-id="{{skill.itemId}}" data-item-property="name" type="text" value="{{skill.label}}" />
  <select class="skill-proficiency pf-rank adjust-item-stat-select" data-item-property="system.proficient.value" data-tooltip="{{skill.breakdown}}" data-rank="{{skill.rank}}">
  {{> "systems/pf2e/templates/actors/character/partials/proficiencylevels-dropdown.hbs" proflevel=skill.rank}}
  </select>