fix: Additional v1.7.x fixes (#289)

* fix: Character generator now properly sets scores

* fix: Items should once again properly display their descriptions.

* fix: Treasure items should be created under the Treasure inventory heading

* fix: Item and armor descriptions should target the correct fields

Author: wyrmisis

src/module/actor/actor-sheet.js

@@ -373,7 +373,7 @@ export class OseActorSheet extends ActorSheet {
   _createItem(event) {
     event.preventDefault();
     const header = event.currentTarget;
-    const type = header.dataset.type;
+    const { treasure, type } = header.dataset;
     const createItem = (type, name) => ({
       name: name ? name : `New ${type.capitalize()}`,
       type: type,
@@ -386,8 +386,11 @@ export class OseActorSheet extends ActorSheet {
         const itemData = createItem(dialogInput.type, dialogInput.name);
         this.actor.createEmbeddedDocuments("Item", [itemData], {});
       });
-    } else
-      return this.actor.createEmbeddedDocuments("Item", [createItem(type)], {});
+    } else {
+      const itemData = createItem(type);
+      if (treasure) itemData.system = { treasure: true }
+      return this.actor.createEmbeddedDocuments("Item", [itemData], {});
+    }
   }
 
   async _updateItemQuantity(event) {

src/module/dialog/character-creation.js

@@ -28,7 +28,7 @@ export class OseCharacterCreator extends FormApplication {
    * @return {Object}
    */
   getData() {
-    let data = foundry.utils.deepClone(this.object.data);
+    let data = foundry.utils.deepClone(this.object);
     data.user = game.user;
     data.config = CONFIG.OSE;
     this.counters = {
@@ -178,7 +178,7 @@ export class OseCharacterCreator extends FormApplication {
     event,
     { updateData = null, preventClose = false, preventRender = false } = {}
   ) {
-    updateData = { ...updateData, data: { scores: this.scores } };
+    updateData = { ...updateData, system: { scores: this.scores } };
     super._onSubmit(event, {
       updateData: updateData,
       preventClose: preventClose,

src/module/item/data-model-item.js

@@ -3,9 +3,7 @@ export default class OseDataModelItem extends foundry.abstract.DataModel {
 		const { SchemaField, StringField, NumberField, BooleanField, ArrayField, ObjectField } = foundry.data.fields;
 		return {
 			treasure: new BooleanField(),
-			details: new ObjectField({
-				description: new StringField(),
-			}),
+			description: new StringField(),
 			tags: new ArrayField(new ObjectField()),
 			cost: new NumberField({ min: 0, initial: 0 }),
 			containerId: new StringField(),
@@ -17,6 +15,11 @@ export default class OseDataModelItem extends foundry.abstract.DataModel {
 		};
 	}
 
+	static migrateData(source) {
+		if (source.details?.description && !source.description)
+			source.description = source.details.description;
+		return source;
+	}
 	get manualTags() {
 		if (!this.tags) return null;
 

src/module/item/item-sheet.js

@@ -52,7 +52,7 @@ export class OseItemSheet extends ItemSheet {
     data.config = CONFIG.OSE;
     data.enriched = {
       description: await TextEditor.enrichHTML(
-        this.item.system?.description || this.item.system?.details?.description || "",
+        this.item.system?.description || "",
         {async: true}
       )
     }

src/templates/items/armor-sheet.html

@@ -87,7 +87,7 @@ <h1 class="charname">
         </div>
       </div>
       <div class="description">
-        {{editor system.enrichedDescription target="system.description"
+        {{editor enriched.description target="system.description"
         button=true owner=owner editable=editable async=true}}
       </div>
     </div>

src/templates/items/item-sheet.html

@@ -82,7 +82,7 @@ <h1 class="charname">
       </div>
       <div class="description weapon-editor">
         {{editor enriched.description
-          target="system.details.description"
+          target="system.description"
           button=true
           owner=owner
           editable=editable