Merge branch 'master' into feature/combat

Author: TheBlackParade

README.md

@@ -25,42 +25,110 @@ The server runs on the 435 revision of the game, which was a game update made on
 
 ### Game World
 
-* Bank :white_check_mark: 
+* Bank :yellow_square: 
     * Withdraw/Deposit 1,5,10,All :heavy_check_mark:
-    * As note  :x: 
+    * As note  :heavy_check_mark: 
     * Swap slot :heavy_check_mark:
-    * Insert mode: :x:
-* Audio :white_check_mark:
-    * Music :white_check_mark:
+    * Insert mode: :heavy_check_mark:
+    * Deposit box :yellow_square: 
+* Audio :yellow_square:
+    * Music :yellow_square:
         * Playing music :heavy_check_mark:
         * Music Regions :x:
         * Music Player tab :x:
-    * Sounds :white_check_mark:
+    * Sounds :yellow_square:
         * Playing sounds :heavy_check_mark:
-        * Sound effects for actions :white_check_mark:
-* Climbing ladders :white_check_mark:
-* Climbing stairs :white_check_mark:
-* Lumbridge mill :white_check_mark:
+        * Sound effects for actions :yellow_square:
+* Climbing ladders :yellow_square:
+* Climbing stairs :yellow_square:
+* Lumbridge mill :yellow_square:
     * Replacing objects for local player only :x:
+    * Grain in hopper :heavy_check_mark:
+    * Operating levers :heavy_check_mark:
+    * Removing flour if and only if grain has been processed :heavy_check_mark:
+* Cow milking :heavy_check_mark:
+* Container filling
+    * Buckets :heavy_check_mark:
+    * Jugs :heavy_check_mark:
+    * Wells :heavy_check_mark:
+    * Sinks :heavy_check_mark:
+    * Fountains :heavy_check_mark:
+    * Emptying Containers :heavy_check_mark:
+* Home Teleport :yellow_square:
+    * Animation :yellow_square:
+* Emotes :yellow_square:
+    * Skillcape :yellow_square:
+    * Normal emotes :heavy_check_mark:
+* Shops :yellow_square: 
+    * Shop logic :heavy_check_mark:
+    * World Shops :yellow_square:
+        * Al Kahrid gem trader :heavy_check_mark:
+        * Louie Armoured legs :heavy_check_mark:
+        * Dommik craftin shop :heavy_check_mark:
+        * Raneal Super skirt :heavy_check_mark:
+        * Bob's axes :heavy_check_mark:
+* Intentory :yellow_square: 
+    * Swap Items :heavy_check_mark:
+    * Drop Item :heavy_check_mark:
+    * Pickup item :heavy_check_mark:
+    * Equip item :yellow_square: 
+        * Complete equiment stats and slot info :yellow_square: 
+        * Wielding logic (Weight, Stats, Equipping) :heavy_check_mark:
+* Pickables :heavy_check_mark:
+    * Wheat :heavy_check_mark:
+    * Flax :heavy_check_mark:
+    * Potato :heavy_check_mark:
+    * Onion :heavy_check_mark:
+    * Cabbage :heavy_check_mark:
+* Doors :yellow_square: 
+    * Door logic :heavy_check_mark:
+    * Door ids :yellow_square: 
+* Clue Scrolls :x:
 
 ### Skills
 
-* Woodcutting :white_check_mark: 
-    * Formula for success :white_check_mark:
-    * Chopping Trees :white_check_mark: 
+* Combat :yellow_square:
+    * Melee :x:
+    * Ranged :x:
+    * Magic :x:
+* Prayer :x:
+* Cooking :x:
+* Fletching :x:
+* Fishing :x:
+* Firemaking :yellow_square:
+* Herblore :x:
+* Agility :x:
+* Thieving :x:
+* Slayer :x:
+* Farming :x:
+* Runecraft :x:
+* Construction :x:
+
+
+* Woodcutting :yellow_square: 
+    * Formula for success :heavy_check_mark:
+    * Chopping Trees :heavy_check_mark: 
     * Axes :heavy_check_mark:
     * Birds nests  :x: 
-    * Stump ids :white_check_mark: 
+    * Stump ids :yellow_square: 
 * Mining 
-    * Formula for success :white_check_mark:
-    * Mining ores :white_check_mark: 
+    * Formula for success :heavy_check_mark:
+    * Mining ores :heavy_check_mark: 
     * Pickaxes :heavy_check_mark:
     * Random gems  :x: 
     * Gem ores :x:
     * Essence mining :x:
-    * Empty Rock ids :white_check_mark: 
+    * Empty Rock ids :yellow_square: 
 * Crafting
     * Spinning wheel :heavy_check_mark:
+* Smithing
+    * Smelting ore to bars :heavy_check_mark:
+    * Forging :yellow_square:
+        * Correct items :heavy_check_mark:
+        * Hiding non applicable items :yellow_square: 
+    
+### Quests
+* Cook's Assistant :heavy_check_mark:
 
 ### Technical Features
 

src/game-server.ts

@@ -121,15 +121,16 @@ export async function runGameServer(): Promise<void> {
     });
     generateCrcTable();
 
-    delete cache.dataChannel;
-    delete cache.metaChannel;
-    delete cache.indexChannels;
-    delete cache.indices;
+    // @TODO keep these in the login server so they don't eat game server memory :)
+    // delete cache.dataChannel;
+    // delete cache.metaChannel;
+    // delete cache.indexChannels;
+    // delete cache.indices;
 
     world = new World();
     await injectPlugins();
 
-    world.init().then(() => delete cache.mapData);
+    world.init();//.then(() => delete cache.mapData);
 
     if(process.argv.indexOf('-fakePlayers') !== -1) {
         world.generateFakePlayers();

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/commands/bank-command.ts

@@ -0,0 +1,13 @@
+import { ActionType, RunePlugin } from '@server/plugins/plugin';
+import { commandAction } from '@server/world/actor/player/action/input-command-action';
+import { openBankInterface } from '@server/plugins/objects/bank/bank-plugin';
+
+const action: commandAction = (details) => {
+    openBankInterface(details as any);
+};
+
+export default new RunePlugin({
+    type: ActionType.COMMAND,
+    commands: [ 'bank' ],
+    action
+});

src/plugins/objects/bank/bank-booth-plugin.ts renamed to src/plugins/objects/bank/bank-plugin.ts

@@ -1,11 +1,20 @@
 import { ActionType, RunePlugin } from '@server/plugins/plugin';
 import { objectIds } from '@server/world/config/object-ids';
-import { widgets } from '@server/world/config/widget';
+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 { 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';
+
+const buttonIds: number[] = [
+    92, // as note
+    93, // as item
+    98, // swap
+    99, // insert
+];
 
 export const openBankInterface: objectAction = (details) => {
     details.player.activeWidget = {
@@ -17,9 +26,8 @@ export const openBankInterface: objectAction = (details) => {
 
     details.player.outgoingPackets.sendUpdateAllWidgetItems(widgets.bank.tabWidget, details.player.inventory);
     details.player.outgoingPackets.sendUpdateAllWidgetItems(widgets.bank.screenWidget, details.player.bank);
-    details.player.outgoingPackets.updateClientConfig(304, details.player.sessionMetadata['bankRearrangeMode'] === 'insert' ? 1 : 0);
-    details.player.outgoingPackets.updateClientConfig(115, details.player.sessionMetadata['bankWithdrawAs'] === 'note' ? 1 : 0);
-
+    details.player.outgoingPackets.updateClientConfig(widgetScripts.bankInsertMode, details.player.settings.bankInsertMode);
+    details.player.outgoingPackets.updateClientConfig(widgetScripts.bankWithdrawNoteMode, details.player.settings.bankWithdrawNoteMode);
 };
 
 export const depositItem: itemAction = (details) => {
@@ -31,17 +39,26 @@ export const depositItem: itemAction = (details) => {
     }
 
     // Check if the player has the item
+
     if (!details.player.hasItemInInventory(details.itemId)) {
         return;
     }
 
+
+    let itemIdToAdd: number = details.itemId;
+    const fromNoteId: number = fromNote(details.itemId);
+    if (fromNoteId > -1) {
+        itemIdToAdd = fromNoteId;
+    }
+
     let countToRemove: number;
     if (details.option.endsWith('all')) {
         countToRemove = -1;
     } else {
         countToRemove = +details.option.replace('deposit-', '');
     }
 
+
     const playerInventory: ItemContainer = details.player.inventory;
     const playerBank: ItemContainer = details.player.bank;
     const slotsWithItem: number[] = playerInventory.findAll(details.itemId);
@@ -51,13 +68,13 @@ export const depositItem: itemAction = (details) => {
         countToRemove = itemAmount;
     }
 
-    if (!playerBank.canFit({itemId: details.itemId, amount: countToRemove}, true)) {
+    if (!playerBank.canFit({itemId: itemIdToAdd, amount: countToRemove}, true)) {
         details.player.sendMessage('Your bank is full.');
         return;
     }
 
 
-    const itemToAdd: Item = {itemId: details.itemId, amount: 0};
+    const itemToAdd: Item = {itemId: itemIdToAdd, amount: 0};
     while (countToRemove > 0 && playerInventory.has(details.itemId)) {
         const invIndex = playerInventory.findIndex(details.itemId);
         const invItem = playerInventory.items[invIndex];
@@ -71,6 +88,7 @@ export const depositItem: itemAction = (details) => {
             countToRemove = 0;
         }
     }
+
     playerBank.addStacking(itemToAdd);
 
 
@@ -91,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) {
+        const 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;
@@ -112,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];
@@ -133,14 +162,34 @@ 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);
     details.player.outgoingPackets.sendUpdateAllWidgetItems(widgets.inventory, details.player.inventory);
     details.player.outgoingPackets.sendUpdateAllWidgetItems(widgets.bank.screenWidget, details.player.bank);
 };
 
+export const btnAction: buttonAction = (details) => {
+    const {player, buttonId} = details;
+    player.settingChanged(buttonId);
+
+    const settingsMappings = {
+        92: {setting: 'bankWithdrawNoteMode', value: 1},
+        93: {setting: 'bankWithdrawNoteMode', value: 0},
+        98: {setting: 'bankInsertMode', value: 0},
+        99: {setting: 'bankInsertMode', value: 1},
+    };
+    if (!settingsMappings.hasOwnProperty(buttonId)) {
+        return;
+    }
+
+    const config = settingsMappings[buttonId];
+    player.settings[config.setting] = config.value;
+};
+
 
 export default new RunePlugin([{
     type: ActionType.OBJECT_ACTION,
@@ -158,4 +207,4 @@ export default new RunePlugin([{
     widgets: widgets.bank.screenWidget,
     options: ['withdraw-1', 'withdraw-5', 'withdraw-10', 'withdraw-all'],
     action: withdrawItem,
-}]);
+}, {type: ActionType.BUTTON, widgetId: widgets.bank.screenWidget.widgetId, buttonIds: buttonIds, action: btnAction}]);

src/plugins/player/login-update-settings-plugin.ts

@@ -21,6 +21,7 @@ export const action: playerInitAction = (details) => {
     player.outgoingPackets.updateClientConfig(widgetScripts.autoRetaliate, settings.autoRetaliateEnabled ? 0 : 1);
     player.outgoingPackets.updateClientConfig(widgetScripts.attackStyle, settings.attackStyle);
     player.outgoingPackets.updateClientConfig(widgetScripts.bankInsertMode, settings.bankInsertMode);
+    player.outgoingPackets.updateClientConfig(widgetScripts.bankWithdrawNoteMode, settings.bankWithdrawNoteMode);
 };
 
 export default new RunePlugin({ type: ActionType.PLAYER_INIT, action });