Przeglądaj źródła

Destructure itemHelpers

tags/v0.4.4^2
Peyrille Benjamin 4 lat temu
rodzic
commit
7d025e43ca
3 zmienionych plików z 8 dodań i 8 usunięć
  1. +3
    -3
      src/server/components/inventory.js
  2. +2
    -2
      src/server/components/inventory/getItem.js
  3. +3
    -3
      src/server/components/stash.js

+ 3
- 3
src/server/components/inventory.js Wyświetl plik

@@ -6,7 +6,7 @@ let mtx = require('../mtx/mtx');
let factions = require('../config/factions');
let itemEffects = require('../items/itemEffects');

const itemHelpers = require('./inventory/helpers');
const { isItemStackable } = require('./inventory/helpers');
const transactions = require('../security/transactions');

const { applyItemStats } = require('./equipment/helpers');
@@ -297,7 +297,7 @@ module.exports = {

if ((!fromItem) || (!toItem))
return;
else if ((!itemHelpers.isItemStackable(fromItem)) || (!itemHelpers.isItemStackable(toItem)))
else if ((!isItemStackable(fromItem)) || (!isItemStackable(toItem)))
return;

toItem.quantity += fromItem.quantity;
@@ -700,7 +700,7 @@ module.exports = {
if (this.inventorySize !== -1) {
if (item) {
let exists = this.items.find(i => (i.name === item.name));
if ((exists) && (!noStack) && (itemHelpers.isItemStackable(item) && itemHelpers.isItemStackable(exists)))
if ((exists) && (!noStack) && (isItemStackable(item) && isItemStackable(exists)))
return true;
}



+ 2
- 2
src/server/components/inventory/getItem.js Wyświetl plik

@@ -1,4 +1,4 @@
const itemHelpers = require('./helpers');
const { isItemStackable } = require('./helpers');

const getNextId = items => {
let id = 0;
@@ -27,7 +27,7 @@ module.exports = (cpnInv, item, hideMessage, noStack, hideAlert) => {
let quantity = item.quantity;

let exists = false;
if (itemHelpers.isItemStackable(item) && !noStack) {
if (isItemStackable(item) && !noStack) {
let existItem = cpnInv.items.find(i => i.name === item.name);
if (existItem) {
exists = true;


+ 3
- 3
src/server/components/stash.js Wyświetl plik

@@ -1,5 +1,5 @@
const cpnInventory = require('./inventory');
const itemHelpers = require('./inventory/helpers');
const { isItemStackable } = require('./inventory/helpers');

const maxItems = 50;

@@ -30,7 +30,7 @@ module.exports = {
getItem: function (item) {
//Material?
let exists = false;
if (itemHelpers.isItemStackable(item)) {
if (isItemStackable(item)) {
let existItem = this.items.find(i => i.name === item.name);
if (existItem) {
exists = true;
@@ -67,7 +67,7 @@ module.exports = {
if (!this.active)
return;
else if (this.items.length >= this.maxItems) {
let isStackable = this.items.some(stashedItem => item.name === stashedItem.name && (itemHelpers.isItemStackable(stashedItem)));
let isStackable = this.items.some(stashedItem => item.name === stashedItem.name && (isItemStackable(stashedItem)));
if (!isStackable) {
this.obj.instance.syncer.queue('onGetMessages', {
id: this.obj.id,


Ładowanie…
Anuluj
Zapisz