Datamodel + Appv2 migration, WIP

module/applications/sheets/_module.mjs

@@ -0,0 +1,3 @@
+export { default as BoLBaseItemSheet } from "./base-item-sheet.mjs"
+export { default as BoLItemSheet } from "./item-sheet.mjs"
+export { default as BoLFeatureSheet } from "./feature-sheet.mjs"

module/applications/sheets/base-item-sheet.mjs

@@ -0,0 +1,243 @@
+const { HandlebarsApplicationMixin } = foundry.applications.api
+
+/**
+ * Base Item Sheet for BoL system using AppV2
+ * @extends {ItemSheetV2}
+ */
+export default class BoLBaseItemSheet extends HandlebarsApplicationMixin(foundry.applications.sheets.ItemSheetV2) {
+  constructor(options = {}) {
+    super(options)
+    this.#dragDrop = this.#createDragDropHandlers()
+  }
+
+  #dragDrop
+
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["bol", "sheet", "item"],
+    position: {
+      width: 650,
+      height: 780,
+    },
+    form: {
+      submitOnChange: true,
+    },
+    window: {
+      resizable: true,
+    },
+    actions: {
+      editImage: BoLBaseItemSheet.#onEditImage,
+      postItem: BoLBaseItemSheet.#onPostItem,
+    },
+  }
+
+  /**
+   * Tab groups state
+   * @type {object}
+   */
+  tabGroups = { primary: "description" }
+
+  /** @override */
+  async _prepareContext() {
+    const context = {
+      // Document & system
+      fields: this.document.schema.fields,
+      systemFields: this.document.system.schema.fields,
+      item: this.document,
+      system: this.document.system,
+      source: this.document.toObject(),
+      
+      // Enriched content
+      enrichedDescription: await foundry.applications.ux.TextEditor.implementation.enrichHTML(
+        this.document.system.description, 
+        { async: true }
+      ),
+      
+      // Properties
+      category: this.document.system.category,
+      itemProperties: this.document.itemProperties,
+      
+      // Config & permissions
+      config: game.bol.config,
+      isGM: game.user.isGM,
+      isEditable: this.isEditable,
+      
+      // CSS classes for template
+      cssClass: this.options.classes.join(" "),
+      
+      // Tab state
+      tabs: this._getTabs(),
+      activeTab: this.tabGroups.primary || "description"
+    }
+
+    // Add careers if item is on an actor
+    if (this.document.actor) {
+      context.careers = this.document.actor.careers
+    }
+
+    // Apply dynamic defaults based on item type
+    this._applyDynamicDefaults(context)
+
+    return context
+  }
+
+  /**
+   * Get tabs configuration
+   * @returns {object[]}
+   * @private
+   */
+  _getTabs() {
+    return [
+      { id: "description", label: "BOL.ui.tab.description", icon: "fa-solid fa-book" },
+      { id: "properties", label: "BOL.ui.tab.details", icon: "fa-solid fa-cog" }
+    ]
+  }
+
+  /**
+   * Apply dynamic defaults to context based on item type and category
+   * @param {object} context
+   * @private
+   */
+  _applyDynamicDefaults(context) {
+    const itemData = context.item
+
+    if (itemData.type === "item") {
+      // Set default category
+      if (!itemData.system.category) {
+        itemData.system.category = "equipment"
+      }
+
+      // Handle equipment slot
+      if (itemData.system.category === "equipment" && itemData.system.properties.equipable) {
+        if (!itemData.system.properties.slot) {
+          itemData.system.properties.slot = "-"
+        }
+      }
+
+      // Handle spell conditions
+      if (itemData.system.category === 'spell') {
+        if (!itemData.system.properties.mandatoryconditions) {
+          itemData.system.properties.mandatoryconditions = []
+        }
+        if (!itemData.system.properties.optionnalconditions) {
+          itemData.system.properties.optionnalconditions = []
+        }
+        for (let i = 0; i < 4; i++) {
+          itemData.system.properties.mandatoryconditions[i] = itemData.system.properties.mandatoryconditions[i] ?? ""
+        }
+        for (let i = 0; i < 8; i++) {
+          itemData.system.properties.optionnalconditions[i] = itemData.system.properties.optionnalconditions[i] ?? ""
+        }
+      }
+    } else if (itemData.type === "feature") {
+      // Set default subtype/category
+      if (!itemData.system.subtype) {
+        itemData.system.category = "origin"
+      }
+    }
+  }
+
+  /** @override */
+  _onRender(context, options) {
+    super._onRender(context, options)
+    this.#dragDrop.forEach((d) => d.bind(this.element))
+    this._activateTabs()
+    this._activateListeners()
+  }
+
+  /**
+   * Activate tab navigation
+   * @private
+   */
+  _activateTabs() {
+    const nav = this.element.querySelector('nav.tabs[data-group="primary"]')
+    if (!nav) return
+
+    const activeTab = this.tabGroups.primary || "description"
+    
+    // Activate tab links
+    nav.querySelectorAll('[data-tab]').forEach(link => {
+      const tab = link.dataset.tab
+      link.classList.toggle('active', tab === activeTab)
+      link.addEventListener('click', (event) => {
+        event.preventDefault()
+        this.tabGroups.primary = tab
+        this.render()
+      })
+    })
+
+    // Show/hide tab content
+    this.element.querySelectorAll('.tab[data-tab]').forEach(content => {
+      content.classList.toggle('active', content.dataset.tab === activeTab)
+    })
+  }
+
+  /**
+   * Activate custom listeners
+   * @private
+   */
+  _activateListeners() {
+    if (!this.isEditable) return
+
+    // Armor quality change handler
+    const armorQuality = this.element.querySelector('.armorQuality')
+    if (armorQuality) {
+      armorQuality.addEventListener('change', (ev) => {
+        const value = ev.currentTarget.value
+        const soakFormula = this.element.querySelector('.soakFormula')
+        if (soakFormula && game.bol.config.soakFormulas[value]) {
+          soakFormula.value = game.bol.config.soakFormulas[value]
+        }
+      })
+    }
+  }
+
+  // #region Drag-and-Drop Workflow
+  
+  /**
+   * Create drag-and-drop workflow handlers for this Application
+   * @returns {DragDrop[]}
+   * @private
+   */
+  #createDragDropHandlers() {
+    return []
+  }
+
+  // #endregion
+
+  // #region Actions
+
+  /**
+   * Handle editing the item image
+   * @param {PointerEvent} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static async #onEditImage(event, target) {
+    const fp = new FilePicker({
+      current: this.document.img,
+      type: "image",
+      callback: (path) => {
+        this.document.update({ img: path })
+      },
+    })
+    return fp.browse()
+  }
+
+  /**
+   * Handle posting the item to chat
+   * @param {PointerEvent} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static async #onPostItem(event, target) {
+    const BoLUtility = (await import("../../system/bol-utility.js")).BoLUtility
+    let chatData = foundry.utils.duplicate(this.document)
+    if (this.document.actor) {
+      chatData.actor = { id: this.document.actor.id }
+    }
+    BoLUtility.postItem(chatData)
+  }
+
+  // #endregion
+}

module/applications/sheets/feature-sheet.mjs

@@ -0,0 +1,40 @@
+import BoLBaseItemSheet from "./base-item-sheet.mjs"
+
+/**
+ * Item Sheet for "feature" type items (boons, careers, origins, etc.)
+ * @extends {BoLBaseItemSheet}
+ */
+export default class BoLFeatureSheet extends BoLBaseItemSheet {
+  
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    ...super.DEFAULT_OPTIONS,
+    classes: [...super.DEFAULT_OPTIONS.classes, "item-type-feature"],
+  }
+
+  /** @override */
+  static PARTS = {
+    main: {
+      template: "systems/bol/templates/item/feature-sheet.hbs",
+    },
+  }
+
+  /** @override */
+  async _prepareContext() {
+    const context = await super._prepareContext()
+    
+    // Add feature-specific context
+    context.isFeature = true
+    context.isBoon = context.system.subtype === "boon"
+    context.isFlaw = context.system.subtype === "flaw"
+    context.isCareer = context.system.subtype === "career"
+    context.isOrigin = context.system.subtype === "origin"
+    context.isRace = context.system.subtype === "race"
+    context.isFightOption = context.system.subtype === "fightoption"
+    context.isEffect = context.system.subtype === "effect"
+    context.isHoroscope = context.system.subtype === "horoscope"
+    context.isXpLog = context.system.subtype === "xplog"
+    
+    return context
+  }
+}

module/applications/sheets/item-sheet.mjs

@@ -0,0 +1,39 @@
+import BoLBaseItemSheet from "./base-item-sheet.mjs"
+
+/**
+ * Item Sheet for "item" type items (equipment, weapons, etc.)
+ * @extends {BoLBaseItemSheet}
+ */
+export default class BoLItemSheet extends BoLBaseItemSheet {
+  
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    ...super.DEFAULT_OPTIONS,
+    classes: [...super.DEFAULT_OPTIONS.classes, "item-type-item"],
+  }
+
+  /** @override */
+  static PARTS = {
+    main: {
+      template: "systems/bol/templates/item/item-sheet.hbs",
+    },
+  }
+
+  /** @override */
+  async _prepareContext() {
+    const context = await super._prepareContext()
+    
+    // Add item-specific context
+    context.isItem = true
+    context.isEquipment = context.category === "equipment"
+    context.isWeapon = context.category === "weapon"
+    context.isProtection = context.category === "protection"
+    context.isSpell = context.category === "spell"
+    context.isAlchemy = context.category === "alchemy"
+    context.isCapacity = context.category === "capacity"
+    context.isMagical = context.category === "magical"
+    context.isVehicle = context.category === "vehicle"
+    
+    return context
+  }
+}

module/bol.js

@@ -5,7 +5,7 @@ import { BoLActorSheet } from "./actor/actor-sheet.js"
 import { BoLVehicleSheet } from "./actor/vehicle-sheet.js"
 import { BoLHordeSheet } from "./actor/horde-sheet.js"
 import { BoLItem } from "./item/item.js"
-import { BoLItemSheet } from "./item/item-sheet.js"
+// Note: Old BoLItemSheet (AppV1) is now replaced by AppV2 sheets
 import { System, BOL } from "./system/config.js"
 import { preloadHandlebarsTemplates } from "./system/templates.js"
 import { registerHandlebarsHelpers } from "./system/helpers.js"
@@ -21,6 +21,9 @@ import { BoLRoll } from "./controllers/bol-rolls.js"
 // Import DataModels
 import * as models from "./models/_module.mjs"
 
+// Import AppV2 Sheets
+import * as sheets from "./applications/sheets/_module.mjs"
+
 /* -------------------------------------------- */
 Hooks.once('init', async function () {
 
@@ -32,7 +35,8 @@ Hooks.once('init', async function () {
     BoLUtility,
     macros: Macros,
     config: BOL,
-    models
+    models,
+    sheets
   };
 
   // Game socket
@@ -57,13 +61,13 @@ Hooks.once('init', async function () {
     horde: models.BoLHorde,
     vehicle: models.BoLVehicle
   }
-  
+
   CONFIG.Item.documentClass = BoLItem;
   CONFIG.Item.dataModels = {
     item: models.BoLItem,
     feature: models.BoLFeature
   }
-  
+
   CONFIG.Combat.documentClass = BoLCombatManager;
 
   // Register sheet application classes
@@ -72,8 +76,17 @@ Hooks.once('init', async function () {
   foundry.documents.collections.Actors.registerSheet("bol", BoLVehicleSheet, { types: ["vehicle"], makeDefault: true })
   foundry.documents.collections.Actors.registerSheet("bol", BoLHordeSheet, { types: ["horde"], makeDefault: true })
 
+  // Register AppV2 Item Sheets
   foundry.documents.collections.Items.unregisterSheet("core", foundry.appv1.sheets.ItemSheet);
-  foundry.documents.collections.Items.registerSheet("bol", BoLItemSheet, { makeDefault: true });
+  foundry.documents.collections.Items.registerSheet("bol", sheets.BoLItemSheet, { types: ["item"], makeDefault: true });
+  foundry.documents.collections.Items.registerSheet("bol", sheets.BoLFeatureSheet, { types: ["feature"], makeDefault: true });
+  
+  // Debug: Verify AppV2 sheets are loaded
+  console.log("BoL Item Sheets registered:", {
+    BoLItemSheet: sheets.BoLItemSheet.name,
+    BoLFeatureSheet: sheets.BoLFeatureSheet.name,
+    extendsApplicationV2: sheets.BoLItemSheet.prototype instanceof foundry.applications.api.ApplicationV2
+  });
 
   // Inot useful stuff
   BoLUtility.init()

module/item.backup/item-sheet.js.appv1

@@ -0,0 +1,119 @@
+import { BoLUtility } from "../system/bol-utility.js";
+
+/**
+ * Extend the basic ItemSheet with some very simple modifications
+ * @extends {ItemSheet}
+ */
+export class BoLItemSheet extends foundry.appv1.sheets.ItemSheet {
+
+  /** @override */
+  static get defaultOptions() {
+    return foundry.utils.mergeObject(super.defaultOptions, {
+      classes: ["bol", "sheet", "item"],
+      template: "systems/bol/templates/item/item-sheet.hbs",
+      width: 650,
+      height: 780,
+      dragDrop: [{ dragSelector: null, dropSelector: null }],
+      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }]
+    });
+  }
+
+  /* -------------------------------------------- */
+  /** @override */
+  async getData(options) {
+    const data = super.getData(options)
+    let itemData = foundry.utils.duplicate(data.document)
+    data.config = game.bol.config
+    data.item = itemData
+    data.category = itemData.system.category
+    data.isGM = game.user.isGM;
+    data.itemProperties = this.item.itemProperties;
+    data.description = await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.description, { async: true })
+    if (data.document.actor) {
+      data.careers = data.document.actor.careers
+    }
+    // Dynamic default data fix/adapt
+    if (itemData.type == "item") {
+      if (!itemData.system.category) {
+        itemData.system.category = "equipment"
+      }
+      if (itemData.system.category == "equipment" && itemData.system.properties.equipable) {
+        if (!itemData.system.properties.slot) {
+          itemData.system.properties.slot = "-"
+        }
+      }
+      if (itemData.system.category == 'spell') {
+        if (!itemData.system.properties.mandatoryconditions) {
+          itemData.system.properties.mandatoryconditions = []
+        }
+        if (!itemData.system.properties.optionnalconditions) {
+          itemData.system.properties.optionnalconditions = []
+        }
+        for (let i = 0; i < 4; i++) {
+          itemData.system.properties.mandatoryconditions[i] = itemData.system.properties.mandatoryconditions[i] ?? ""
+        }
+        for (let i = 0; i < 8; i++) {
+          itemData.system.properties.optionnalconditions[i] = itemData.system.properties.optionnalconditions[i] ?? ""
+        }
+      }
+    } else {
+      if (!itemData.system.subtype) {
+        itemData.system.category = "origin"
+      }
+    }
+
+    console.log("ITEMDATA", data);
+    return data;
+  }
+
+  /* -------------------------------------------- */
+  _getHeaderButtons() {
+    let buttons = super._getHeaderButtons();
+    buttons.unshift({
+      class: "post",
+      icon: "fas fa-comment",
+      onclick: ev => this.postItem()
+    });
+    return buttons
+  }
+
+  /* -------------------------------------------- */
+  postItem() {
+    let chatData = foundry.utils.duplicate(this.item)
+    if (this.actor) {
+      chatData.actor = { id: this.actor.id };
+    }
+    BoLUtility.postItem(chatData);
+  }
+
+
+  /* -------------------------------------------- */
+  /** @override */
+  setPosition(options = {}) {
+    const position = super.setPosition(options);
+    const sheetBody = this.element.find(".sheet-body");
+    const bodyHeight = position.height - 192;
+    sheetBody.css("height", bodyHeight);
+    return position;
+  }
+
+  /* -------------------------------------------- */
+
+  /** @override */
+  activateListeners(html) {
+
+    super.activateListeners(html);
+
+    // Everything below here is only needed if the sheet is editable
+    if (!this.options.editable) return;
+    // Roll handlers, click handlers, etc. would go here.
+
+    html.find('.armorQuality').change(ev => {
+      const li = $(ev.currentTarget);
+      console.log(game.bol.config.soakFormulas[li.val()]);
+      $('.soakFormula').val(game.bol.config.soakFormulas[li.val()]);
+    });
+
+  }
+
+}

module/item.backup/item.js

@@ -0,0 +1,36 @@
+/**
+ * Extend the basic Item with some very simple modifications.
+ * @extends {Item}
+ */
+export class BoLItem extends Item {
+  /**
+   * Augment the basic Item data model with additional dynamic data.
+   */
+  prepareData() {
+    super.prepareData()
+
+    const actorData = this.actor ? this.actor.system : {}
+  }
+
+  /* -------------------------------------------- */
+  get properties() {
+    return this.system.properties
+  }
+
+  /* -------------------------------------------- */
+  /**
+   * Get the Array of item properties which are used in the small sidebar of the description tab
+   * @return {Array}
+   * @private
+   */
+  get itemProperties() {
+    const props = [];
+    if ( this.type === "item" ) {
+      const entries = Object.entries(this.system.properties)
+      props.push(...entries.filter(e => e[1] === true).map(e => { return game.bol.config.itemProperties2[e[0]] }))
+    }
+    return props.filter(p => !!p)
+  }
+
+
+}

module/models/feature.mjs

@@ -8,7 +8,7 @@ export default class BoLFeatureDataModel extends foundry.abstract.TypeDataModel
     
     return {
       // Base fields
-      category: new fields.StringField({ initial: null }),
+      category: new fields.StringField({ initial: "" }),
       subtype: new fields.StringField({ initial: "default" }),
       description: new fields.HTMLField({ initial: "" }),
       properties: new fields.SchemaField({}),

module/models/item.mjs

@@ -8,7 +8,7 @@ export default class BoLItemDataModel extends foundry.abstract.TypeDataModel {
     
     return {
       // Base fields
-      category: new fields.StringField({ initial: null }),
+      category: new fields.StringField({ initial: "" }),
       subtype: new fields.StringField({ initial: "default" }),
       description: new fields.HTMLField({ initial: "" }),
       properties: new fields.SchemaField({