From c7b54a0abf6a00c4c7790bc4e1e856b24eb3e507 Mon Sep 17 00:00:00 2001 From: Husman Date: Wed, 22 Jun 2016 20:19:48 -0700 Subject: [PATCH] Addressing comments --- .../client/js/controllers/inventoryCtrl.js | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/website/client/js/controllers/inventoryCtrl.js b/website/client/js/controllers/inventoryCtrl.js index 6650d6586e..ce16be8b9a 100644 --- a/website/client/js/controllers/inventoryCtrl.js +++ b/website/client/js/controllers/inventoryCtrl.js @@ -62,19 +62,16 @@ habitrpg.controller("InventoryCtrl", var item = Content.gear.flat[key]; - if (item.klass == User.user.stats.class || item.specialClass == User.user.stats.class) { - item._effectiveStr = item.str * 1.5; - item._effectiveCon = item.con * 1.5; - item._effectivePer = item.per * 1.5; - item._effectiveInt = item.int * 1.5; - } - else { - item._effectiveStr = item.str; - item._effectiveCon = item.con; - item._effectivePer = item.per; - item._effectiveInt = item.int; + var bonusMultiplier = 1; + if (item.klass === User.user.stats.class || item.specialClass === User.user.stats.class) { + bonusMultiplier = 1.5; } + item._effectiveStr = item.str * bonusMultiplier; + item._effectiveCon = item.con * bonusMultiplier; + item._effectivePer = item.per * bonusMultiplier; + item._effectiveInt = item.int * bonusMultiplier; + if (!$scope.gearByClass[item.klass]) { $scope.gearByClass[item.klass] = []; }