Merge pull request #235 from RabidOwlbear/main

party sheet/container fix

src/module/actor/actor-sheet.js

@@ -226,6 +226,7 @@ export class OseActorSheet extends ActorSheet {
   }
 
   _onDragStart(event) {
+    const v10 = isNewerVersion(game.version, "10.264");
     const li = event.currentTarget;
     let itemIdsArray = [];
     if (event.target.classList.contains("content-link")) return;
@@ -242,10 +243,10 @@ export class OseActorSheet extends ActorSheet {
     if (li.dataset.itemId) {
       const item = this.actor.items.get(li.dataset.itemId);
       dragData.type = "Item";
-      dragData.data = item.data;
-      if (item.data.type === "container" && item.data.data.itemIds.length) {
+      dragData.data = v10 ? item : item.data;
+      if (item.type === "container" && item.system.itemIds.length) {
         //otherwise JSON.stringify will quadruple stringify for some reason
-        itemIdsArray = item.data.data.itemIds;
+        itemIdsArray = v10 ? item.system.itemIds : item.data.data.itemIds;
       }
     }
 
@@ -269,23 +270,121 @@ export class OseActorSheet extends ActorSheet {
       })
     );
   }
+  async _onDropItem(event, data){
+    const v10 = isNewerVersion(game.version, "10.264");
+    const item = await Item.implementation.fromDropData(data);
+    const itemContainer = v10 ? this.object.items.get(item?.system?.containerId) : this.object.items.get(item?.data?.data?.containerId);
+    const itemData = item.toObject();
+    const targetEl = event.target.closest('.item')
+    const targetItem = this.object.items.get(targetEl?.dataset?.itemId)
+    let targetIsContainer
+    if(v10) targetIsContainer = targetItem?.type == 'container' ? true : false;
+    if(v10) targetIsContainer = targetItem?.data?.type == 'container' ? true : false;
+    const exists = this.object.items.get(item.id) ? true : false;
+    console.log(exists)
+
+
+    if(targetIsContainer){
+      return this._onContainerItemAdd(item, targetItem)
+    }  else if (itemContainer){
+      this._onContainerItemRemove(item, itemContainer)
+
+    } else{
+      if(!exists){
+      return this._onDropItemCreate([itemData])
+      }
+    }
+
+
+
+  }
+  async _onContainerItemRemove(item, container){
+    const v10 = isNewerVersion(game.version, "10.264");
+    let newList = v10 ? container.system.itemIds.filter(i=>i.id != item.id) : container.data.data.itemIds.filter(i=>i.data,id != item.data.id);
+    const itemObj = v10 ? this.object.items.get(item.id) : this.object.items.get(item.data.id);
+    if(v10){
+      await container.update({system: {itemIds: newList}});
+      await itemObj.update({system:{containerId: ''}});
+    }
+    if(!v10){
+      await container.update({data:{data:{itemIds: newList}}});
+      await itemObj.update({data:{data:{containerId: ''}}});
+    }
 
-  async _onDropItemCreate(itemData) {
+  }
+  async _onContainerItemAdd(item, target){
+    const v10 = isNewerVersion(game.version, "10.264");
+    const itemData = item.toObject();
+    const container = v10 ? this.object.items.get(target.id) :this.object.items.get(target.data.id);
+
+    const containerId = v10 ? container.id : container.data.id;
+    const itemObj = v10 ? this.object.items.get(item.id) : this.object.items.get(item.data.id);
+    const alreadyExists = v10 ? container.system.itemIds.find(i=>i.id == item.id) :container.data.data.itemIds.find(i=>i.data.id == item.data.id);
+    if(!alreadyExists){
+      if(v10){
+        const newList = [...container.system.itemIds];
+        newList.push(item.id);
+        await container.update({system:{itemIds: newList}})
+        await itemObj.update({system:{containerId: container.id}})
+      }
+      if(!v10){
+        const newList = [...container.data.data.itemIds];
+        newList.push(item.data.id);
+        await container.update({data:{ data: {itemIds: newList}}})
+        await itemObj.update({data:{ data: {containerId: container.id}}})
+      }
+    }
+
+  }
+  async _onDropItemCreate(itemData, container = false) {
+    const v10 = isNewerVersion(game.version, "10.264");
     //override to fix hidden items because their original containers don't exist on this actor
     itemData = itemData instanceof Array ? itemData : [itemData];
     itemData.forEach((item) => {
-      if (item.data.containerId && item.data.containerId !== "")
+
+      if(v10){
+        if (item.system.containerId && item.system.containerId !== "")
+          item.system.containerId = "";}
+        if (item.type === "container" && typeof item.system.itemIds === "string") {
+          //itemIds was double stringified to fix strange behavior with stringify blanking our Arrays
+          const containedItems = JSON.parse(item.system.itemIds);
+          containedItems.forEach((containedItem) => {
+            containedItem.system.containerId = "";
+          });
+          itemData.push(...containedItems);
+        }
+      if(!v10){
+        if (item.data.containerId && item.data.containerId !== "")
         item.data.containerId = "";
-      if (item.type === "container" && typeof item.data.itemIds === "string") {
-        //itemIds was double stringified to fix strange behavior with stringify blanking our Arrays
-        const containedItems = JSON.parse(item.data.itemIds);
-        containedItems.forEach((containedItem) => {
-          containedItem.data.containerId = "";
-        });
-        itemData.push(...containedItems);
+        if (item.type === "container" && typeof item.data.data.itemIds === "string") {
+          //itemIds was double stringified to fix strange behavior with stringify blanking our Arrays
+          const containedItems = JSON.parse(item.data.data.itemIds);
+          containedItems.forEach((containedItem) => {
+            containedItem.data.data.containerId = "";
+          });
+          itemData.push(...containedItems);
+        }
+      };
+
+
+    })
+    if (!container) {
+      return this.actor.createEmbeddedDocuments("Item", itemData);
+    }
+    if (container){
+      let itemIds = v10 ? container.system.itemIds : container.data.data.itemIds;
+      itemIds.push(itemData.id);
+      const item = this.actor.items.get(itemData[0]._id);
+      if(v10){
+        await item.update({system:{containerId: container.id}});
+        await container.update({system:{itemIds: itemIds}});
       }
-    });
-    return this.actor.createEmbeddedDocuments("Item", itemData);
+      if(!v10){
+        await item.update({data:{data:{containerId: container.id}}});
+        await container.update({data:{data:{itemIds: itemIds}}});
+      }
+
+    }
   }
 
   /* -------------------------------------------- */

src/module/actor/character-sheet.js

@@ -120,7 +120,7 @@ export class OseActorSheetCharacter extends OseActorSheet {
       ...Object.values(data.owned),
       ...Object.values(data.spells),
       data.abilities,
-    ].forEach((o) => o.sort((a, b) => (a.data.sort || 0) - (b.data.sort || 0)));
+    ].forEach((o) => o.sort((a, b) => (a.sort || 0) - (b.sort || 0)));
   }
 
   generateScores() {
@@ -297,7 +297,7 @@ export class OseActorSheetCharacter extends OseActorSheet {
       const item = this.actor.items.get(li.data("itemId"));
       await item.update({
         data: {
-          equipped: !item.data.data.equipped,
+          equipped: !item.system.equipped,
         },
       });
     });

src/module/party/party-sheet.js

@@ -61,10 +61,12 @@ export class OsePartySheet extends FormApplication {
       user: game.user,
       settings: settings,
     };
+
     return data;
   }
 
   async _addActorToParty(actor) {
+
     if (actor.type !== "character") {
       return;
     }
@@ -83,14 +85,14 @@ export class OsePartySheet extends FormApplication {
   /* - Adding to the Party Sheet -*/
   _onDrop(event) {
     event.preventDefault();
-
     // WIP Drop Items
     let data;
     try {
       data = JSON.parse(event.dataTransfer.getData("text/plain"));
 
       switch (data.type) {
         case "Actor":
+
           return this._onDropActor(event, data);
         case "Folder":
           return this._onDropFolder(event, data);
@@ -100,13 +102,14 @@ export class OsePartySheet extends FormApplication {
     }
   }
 
-  _onDropActor(event, data) {
+  async _onDropActor(event, data) {
+
     if (data.type !== "Actor") {
       return;
     }
 
     const actors = game.actors;
-    let droppedActor = actors.find((actor) => actor.id === data.id);
+    let droppedActor = await fromUuid(data.uuid);
 
     this._addActorToParty(droppedActor);
   }

src/module/party/party.js

@@ -1,11 +1,19 @@
 export class OseParty {
   static get currentParty() {
-    const characters = game.actors.filter(
-      (act) =>
-        act.data.type === "character" &&
-        act.data.flags.ose &&
-        act.data.flags.ose.party === true);
-
+    const v10 = isNewerVersion(game.version, "10.264");
+    const systemName = game.system.id == 'ose' ?game.system.id : 'ose-dev'
+    const characters = v10 ? 
+      game.actors.filter(
+        (act) =>
+          act.type === "character" &&
+          act.flags[systemName] &&
+          act.flags[systemName].party === true) :
+      game.actors.filter(
+        (act) =>
+          act.data.type === "character" &&
+          act.data.flags[systemName] &&
+          act.data.flags[systemName].party === true);
+      console.log(characters)
     return characters;
   }
 }