From 504e9ca67c4836ed0e54f866e5c9a9b12cbd5adc Mon Sep 17 00:00:00 2001 From: Big Bad Waffle Date: Fri, 4 May 2018 22:00:45 +0200 Subject: [PATCH] fixed an issue with uneq'ing items due to downscaled attributes --- src/client/js/components/inventory.js | 3 ++- src/server/components/inventory.js | 3 ++- src/server/components/stats.js | 1 + src/server/items/generators/attrRequire.js | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/client/js/components/inventory.js b/src/client/js/components/inventory.js index 4b0e6fa5..155100bd 100644 --- a/src/client/js/components/inventory.js +++ b/src/client/js/components/inventory.js @@ -64,12 +64,13 @@ define([ equipItemErrors: function (item) { var errors = []; var stats = this.obj.stats.values; + var originalValues = this.obj.stats.originalValues; var playerLevel = (stats.originalLevel || stats.level); if (item.level > playerLevel) errors.push('level'); - if ((item.requires) && (stats[item.requires[0].stat] < item.requires[0].value)) + if ((item.requires) && (originalValues[item.requires[0].stat] < item.requires[0].value)) errors.push('stats'); if (item.factions) { diff --git a/src/server/components/inventory.js b/src/server/components/inventory.js index c3379277..067ca03d 100644 --- a/src/server/components/inventory.js +++ b/src/server/components/inventory.js @@ -1032,12 +1032,13 @@ define([ return []; var stats = this.obj.stats.values; + var originalValues = this.obj.stats.originalValues; var playerLevel = (stats.originalLevel || stats.level); if (item.level > playerLevel) errors.push('level'); - if ((item.requires) && (stats[item.requires[0].stat] < item.requires[0].value)) + if ((item.requires) && (originalValues[item.requires[0].stat] < item.requires[0].value)) errors.push(item.requires[0].stat); if (item.factions) { diff --git a/src/server/components/stats.js b/src/server/components/stats.js index 36968c63..a31c027e 100644 --- a/src/server/components/stats.js +++ b/src/server/components/stats.js @@ -706,6 +706,7 @@ define([ return { type: 'stats', values: values, + originalValues: this.originalValues, stats: this.stats, vitScale: this.vitScale }; diff --git a/src/server/items/generators/attrRequire.js b/src/server/items/generators/attrRequire.js index adf8cb6d..6b97841c 100644 --- a/src/server/items/generators/attrRequire.js +++ b/src/server/items/generators/attrRequire.js @@ -4,9 +4,9 @@ define([ generatorStats ) { return { - minSlotPerfection: 0.5, + minSlotPerfection: 0.1, maxSlotPerfection: 1, - minLevelMult: 0., + minLevelMult: 0.3, maxLevelMult: 1, generate: function (item, blueprint) {