bank inserting

Author: Promises

src/net/incoming-packets/item-swap-packet.ts

@@ -1,6 +1,6 @@
 import { incomingPacket } from '../incoming-packet';
 import { Player } from '../../world/actor/player/player';
-import { swapItemAction } from '../../world/actor/player/action/swap-item-action';
+import { insertItemAction, swapItemAction } from '../../world/actor/player/action/swap-item-action';
 import { ByteBuffer } from '@runejs/byte-buffer';
 
 export const itemSwapPacket: incomingPacket = (player: Player, packetId: number, packetSize: number, packet: ByteBuffer): void => {
@@ -18,6 +18,6 @@ export const itemSwapPacket: incomingPacket = (player: Player, packetId: number,
         // Swap
         swapItemAction(player, fromSlot, toSlot, { widgetId, containerId });
     } else if(swapType === 1) {
-        // @TODO insert
+        insertItemAction(player, fromSlot, toSlot, { widgetId, containerId });
     }
 };

src/plugins/objects/bank/bank-plugin.ts

@@ -4,7 +4,7 @@ import { widgets, widgetScripts } from '@server/world/config/widget';
 import { objectAction } from '@server/world/actor/player/action/object-action';
 import { ItemContainer } from '@server/world/items/item-container';
 import { itemAction } from '@server/world/actor/player/action/item-action';
-import { fromNote, Item } from '@server/world/items/item';
+import { fromNote, Item, toNote } from '@server/world/items/item';
 import { buttonAction } from '@server/world/actor/player/action/button-action';
 import { logger } from '@runejs/logger/dist/logger';
 import { hasValueNotNull } from '@server/util/data';
@@ -109,6 +109,18 @@ export const withdrawItem: itemAction = (details) => {
     if (!details.player.hasItemInBank(details.itemId)) {
         return;
     }
+
+    let itemIdToAdd: number = details.itemId;
+    if (details.player.settings.bankWithdrawNoteMode) {
+        let toNoteId: number = toNote(details.itemId);
+        if (toNoteId > -1) {
+            itemIdToAdd = toNoteId;
+        } else {
+            details.player.sendMessage('This item can not be withdrawn as a note.');
+        }
+    }
+
+
     let countToRemove: number;
     if (details.option.endsWith('all')) {
         countToRemove = -1;
@@ -130,14 +142,13 @@ export const withdrawItem: itemAction = (details) => {
             countToRemove = slots;
         }
     }
-
-    if (!playerInventory.canFit({itemId: details.itemId, amount: countToRemove})) {
+    if (!playerInventory.canFit({itemId: itemIdToAdd, amount: countToRemove}) || countToRemove === 0) {
         details.player.sendMessage('Your inventory is full.');
         return;
     }
 
 
-    const itemToAdd: Item = {itemId: details.itemId, amount: 0};
+    const itemToAdd: Item = {itemId: itemIdToAdd, amount: 0};
     while (countToRemove > 0 && playerBank.has(details.itemId)) {
         const invIndex = playerBank.findIndex(details.itemId);
         const invItem = playerBank.items[invIndex];
@@ -151,7 +162,9 @@ export const withdrawItem: itemAction = (details) => {
             countToRemove = 0;
         }
     }
-    playerInventory.addStacking(itemToAdd);
+    for (let i = 0; i < itemToAdd.amount; i++) {
+        playerInventory.add({itemId: itemIdToAdd, amount: 1});
+    }
 
 
     details.player.outgoingPackets.sendUpdateAllWidgetItems(widgets.bank.tabWidget, details.player.inventory);

src/world/actor/player/action/swap-item-action.ts

@@ -1,23 +1,56 @@
 import { Player } from '../player';
 import { widgets } from '../../../config/widget';
+import { logger } from '@runejs/logger/dist/logger';
 
 export const swapItemAction = (player: Player, fromSlot: number, toSlot: number, widget: { widgetId: number, containerId: number }) => {
-    if(widget.widgetId === widgets.inventory.widgetId && widget.containerId === widgets.inventory.containerId) {
+    if (widget.widgetId === widgets.inventory.widgetId && widget.containerId === widgets.inventory.containerId) {
         const inventory = player.inventory;
 
-        if(toSlot > inventory.size - 1 || fromSlot > inventory.size - 1) {
+        if (toSlot > inventory.size - 1 || fromSlot > inventory.size - 1) {
             return;
         }
 
         inventory.swap(fromSlot, toSlot);
     }
-    if(widget.widgetId === widgets.bank.screenWidget.widgetId && widget.containerId === widgets.bank.screenWidget.containerId) {
+    if (widget.widgetId === widgets.bank.screenWidget.widgetId && widget.containerId === widgets.bank.screenWidget.containerId) {
         const bank = player.bank;
 
-        if(toSlot > bank.size - 1 || fromSlot > bank.size - 1) {
+        if (toSlot > bank.size - 1 || fromSlot > bank.size - 1) {
             return;
         }
 
         bank.swap(fromSlot, toSlot);
     }
 };
+
+
+export const insertItemAction = (player: Player, fromSlot: number, toSlot: number, widget: { widgetId: number, containerId: number }) => {
+    if (widget.widgetId === widgets.bank.screenWidget.widgetId && widget.containerId === widgets.bank.screenWidget.containerId) {
+        const bank = player.bank;
+
+        if (toSlot > bank.size - 1 || fromSlot > bank.size - 1) {
+            return;
+        }
+        if (fromSlot < toSlot) {
+            let slot = toSlot;
+            let current = bank.remove(fromSlot);
+            while (slot >= fromSlot) {
+                let temp = bank.remove(slot);
+                bank.set(slot, current);
+                current = temp;
+                slot--;
+            }
+        } else {
+            let slot = toSlot;
+            let current = bank.remove(fromSlot);
+            while (slot <= fromSlot) {
+                let temp = bank.remove(slot);
+                bank.set(slot, current);
+                current = temp;
+                slot++;
+            }
+        }
+        player.outgoingPackets.sendUpdateAllWidgetItems(widgets.bank.screenWidget, player.bank);
+
+    }
+};

src/world/items/item-container.ts

@@ -196,12 +196,15 @@ export class ItemContainer {
         return slot;
     }
 
-    public remove(slot: number, fireEvent: boolean = true): void {
+    public remove(slot: number, fireEvent: boolean = true): Item {
+        let item = this._items[slot];
         this._items[slot] = null;
 
         if (fireEvent) {
             this._containerUpdated.next({type: 'REMOVE', slot});
         }
+        return item;
+
     }
 
     public getFirstOpenSlot(): number {