Fixes

fantasycalendar · Aug 20, 2022 · cafeb13 · cafeb13
1 parent a6f4143
commit cafeb13
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/src/API/private-api.js b/src/API/private-api.js
@@ -524,7 +524,11 @@ export default class PrivateAPI {
       if (targetUuid) {
         itemsDropped = await this._transferItems(sourceUuid, targetUuid, itemsToTransfer, userId);
       } else {
-        itemsDropped = await this._removeItems(sourceUuid, itemsToTransfer, userId);
+        itemsDropped = (await this._removeItems(sourceUuid, itemsToTransfer, userId)).map(item => {
+          item.quantity = Math.abs(item.quantity)
+          setProperty(item.item, game.itempiles.ITEM_QUANTITY_ATTRIBUTE, Math.abs(item.quantity))
+          return item;
+        });
         targetUuid = await this._createItemPile(sceneId, position, { items: itemsDropped });
       }
 
@@ -553,7 +557,7 @@ export default class PrivateAPI {
 
     if (!pileActorName) {
 
-      pileActor = Helpers.getSetting(SETTINGS.DEFAULT_ITEM_PILE_ACTOR_ID);
+      pileActor = game.actors.get(Helpers.getSetting(SETTINGS.DEFAULT_ITEM_PILE_ACTOR_ID));
 
       if (!pileActor) {
 
@@ -614,8 +618,7 @@ export default class PrivateAPI {
       }
 
       items = items ? items.map(item => {
-        let itemData = item.item ?? item;
-        return itemData;
+        return item.item ?? item;
       }) : [];
 
       overrideData['actorData'] = {
@@ -1062,26 +1065,26 @@ export default class PrivateAPI {
       }
     }
 
+    if (droppableDocuments.length) {
+      action = "addToPile";
+    }
+
     if (hotkeyState.altDown) {
 
-      if (droppableDocuments.length) {
-        action = "addToPile";
-      }
-
       setProperty(dropData.itemData.item, game.itempiles.ITEM_QUANTITY_ATTRIBUTE, 1);
       dropData.itemData.quantity = 1;
 
     } else {
 
-      const quantity = getProperty(dropData.itemData.item, game.itempiles.ITEM_QUANTITY_ATTRIBUTE);
+      const quantity = Utilities.getItemQuantity(dropData.itemData.item);
 
       let result = { action: "addToPile", quantity: 1 }
       if (quantity > 1) {
         result = await DropItemDialog.show(item, droppableDocuments[0]);
         if (!result) return false;
+        action = result.action;
       }
 
-      action = result.action;
       setProperty(dropData.itemData.item, game.itempiles.ITEM_QUANTITY_ATTRIBUTE, Number(result.quantity))
       dropData.itemData.quantity = Number(result.quantity);
 

diff --git a/src/applications/item-pile-inventory-app/ListEntry.svelte b/src/applications/item-pile-inventory-app/ListEntry.svelte
@@ -7,6 +7,8 @@
   export let store;
   export let entry;
 
+  const name = entry.name;
+  const img = entry.img;
   const quantityLeft = entry.quantityLeft;
   const quantity = entry.quantity;
   const currentQuantity = entry.currentQuantity;
@@ -38,12 +40,12 @@
          on:mouseenter={mouseEnterImage}
          on:mouseleave={mouseLeaveImage}
     />-->
-    <img class="item-piles-img" src="{entry.img}"/>
+    <img class="item-piles-img" src="{$img}"/>
   </div>
 
   <div class="item-piles-name">
     <div class="item-piles-name-container">
-      <p class:item-piles-clickable-link="{canPreview}" on:click={previewItem}>{entry.name}</p>
+      <p class:item-piles-clickable-link="{canPreview}" on:click={previewItem}>{$name}</p>
       {#if !editQuantities}
         <span class="item-piles-small-text">(x{$quantity})</span>
       {/if}

diff --git a/src/helpers/transaction.js b/src/helpers/transaction.js
@@ -23,7 +23,7 @@ export default class Transaction {
     for (let data of items) {
       let item = data.item ?? data;
       let itemData = item instanceof Item ? item.toObject() : item;
-      if (SYSTEMS.DATA.ITEM_TRANSFORMER) {
+      if (SYSTEMS.DATA.ITEM_TRANSFORMER && !remove) {
         itemData = await SYSTEMS.DATA.ITEM_TRANSFORMER(itemData);
       }
       const incomingQuantity = Math.abs(data.quantity ?? Utilities.getItemQuantity(itemData)) * (remove ? -1 : 1);