TMP

lang/en.json

@@ -140,6 +140,7 @@
 "DND5E.AdvancementItemChoiceHint": "Present the player with a choice of items (such as equipment, features, or spells) that they can choose for their character at one or more levels.",
 "DND5E.AdvancementItemChoiceChosen": "Chosen: {current} of {max}",
 "DND5E.AdvancementItemChoiceLevelsHint": "Specify how many choices are allowed at each level.",
+"DND5E.AdvancementItemChoicePreviouslyChosenWarning": "This item has already been chosen at a previous level.",
 "DND5E.AdvancementItemChoiceSpellLevelAvailable": "Any Available Level",
 "DND5E.AdvancementItemChoiceSpellLevelAvailableWarning": "Only {level} or lower spells can be chosen for this advancement.",
 "DND5E.AdvancementItemChoiceSpellLevelSpecificWarning": "Only {level} spells can be chosen for this advancement.",

module/applications/advancement/item-choice-flow.mjs

@@ -134,9 +134,11 @@ export default class ItemChoiceFlow extends ItemGrantFlow {
  if ( this.selected.has(item.uuid) ) return false;
 
  // Check to ensure the dropped item hasn't been selected at a lower level
- for ( const [level, data] of Object.entries(this.advancement.value) ) {
+ for ( const [level, data] of Object.entries(this.advancement.value.added ?? {}) ) {
  if ( level >= this.level ) continue;
- if ( Object.values(data).includes(item.uuid) ) return;
+ if ( Object.values(data).includes(item.uuid) ) {
+ return ui.notifications.error(game.i18n.localize("DND5E.AdvancementItemChoicePreviouslyChosenWarning"));
+ }
  }
 
  // If spell level is restricted to available level, ensure the spell is of the appropriate level