From 9cf622a1e8b98acc5eb0dc77bced07b95065c58d Mon Sep 17 00:00:00 2001 From: Shaun Date: Sun, 26 Apr 2020 20:30:27 +0200 Subject: [PATCH] moved recipe stuff to mod --- .../components/inventory/learnRecipe.js | 50 ------------------- src/server/components/inventory/useItem.js | 13 ++--- src/server/db/tableNames.js | 11 ++-- 3 files changed, 12 insertions(+), 62 deletions(-) delete mode 100644 src/server/components/inventory/learnRecipe.js diff --git a/src/server/components/inventory/learnRecipe.js b/src/server/components/inventory/learnRecipe.js deleted file mode 100644 index 0695fe92..00000000 --- a/src/server/components/inventory/learnRecipe.js +++ /dev/null @@ -1,50 +0,0 @@ -module.exports = async ({ serverId, name }, { recipe: { profession, teaches } }) => { - const recipes = await io.getAsync({ - key: name, - table: 'recipes', - isArray: true - }); - - const known = recipes.some(r => r.profession === profession && r.teaches === teaches); - if (known) { - process.send({ - method: 'events', - data: { - onGetAnnouncement: [{ - obj: { - msg: 'You already know that recipe' - }, - to: [serverId] - }] - } - }); - - return false; - } - - recipes.push({ - profession, - teaches - }); - - await io.setAsync({ - key: name, - table: 'recipes', - value: recipes, - serialize: true - }); - - process.send({ - method: 'events', - data: { - onGetAnnouncement: [{ - obj: { - msg: 'The recipe imprints itself in your mind, then vanishes' - }, - to: [serverId] - }] - } - }); - - return true; -}; diff --git a/src/server/components/inventory/useItem.js b/src/server/components/inventory/useItem.js index 4df700f2..f59ec760 100644 --- a/src/server/components/inventory/useItem.js +++ b/src/server/components/inventory/useItem.js @@ -1,5 +1,3 @@ -const learnRecipe = require('./learnRecipe'); - const isOnCooldown = (obj, cpnInv, item) => { if (item.cdMax) { if (item.cd) { @@ -38,17 +36,14 @@ module.exports = async (cpnInv, itemId) => { if (isOnCooldown(obj, cpnInv, item)) return; - let result = {}; + let result = { + ignore: false + }; obj.instance.eventEmitter.emit('onBeforeUseItem', obj, item, result); obj.fireEvent('onBeforeUseItem', item, result); - if (item.recipe) { - const didLearn = await learnRecipe(obj, item); - if (didLearn) - cpnInv.destroyItem(itemId, 1); - + if (result.ignore) return; - } let effects = (item.effects || []); let eLen = effects.length; diff --git a/src/server/db/tableNames.js b/src/server/db/tableNames.js index cc7269e4..4ccd999e 100644 --- a/src/server/db/tableNames.js +++ b/src/server/db/tableNames.js @@ -1,4 +1,6 @@ -module.exports = [ +const events = require('../misc/events'); + +const tableNames = [ 'character', 'characterList', 'stash', @@ -11,6 +13,9 @@ module.exports = [ 'error', 'modLog', 'accountInfo', - 'mtxStash', - 'recipes' + 'mtxStash' ]; + +events.emit('onBeforeGetTableNames', tableNames); + +module.exports = tableNames;