krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 06:07:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing unintended impact on last page and including special classes

Browse Source
This commit is contained in:
Husman
2016-06-22 19:58:36 -07:00
parent cc476a0dee
commit 2d327ca6ea
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
website/client/js/controllers/inventoryCtrl.js
View File

@@ -62,12 +62,17 @@ habitrpg.controller("InventoryCtrl",
var item = Content.gear.flat[key];
if (item.klass == User.user.stats.class)
{
item.str = item.str * 1.5;
item.con = item.con * 1.5;
item.per = item.per * 1.5;
item.int = item.int * 1.5;
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;
}
if (!$scope.gearByClass[item.klass]) {

8
website/client/js/controllers/sortableInventoryCtrl.js
View File

@@ -1,10 +1,10 @@
habitrpg.controller('SortableInventoryController', ['$scope',
function ($scope) {
var attributeSort = {
constitution: ['-con', '-(con+int+per+str)'],
intelligence: ['-int', '-(con+int+per+str)'],
perception: ['-per', '-(con+int+per+str)'],
strength: ['-str', '-(con+int+per+str)'],
constitution: ['-(_effectiveCon)', '-(_effectiveCon+_effectiveInt+_effectivePer+_effectiveStr)'],
intelligence: ['-(_effectiveInt)', '-(_effectiveCon+_effectiveInt+_effectivePer+_effectiveStr)'],
perception: ['-(_effectivePer)', '-(_effectiveCon+_effectiveInt+_effectivePer+_effectiveStr)'],
strength: ['-(_effectiveStr)', '-(_effectiveCon+_effectiveInt+_effectivePer+_effectiveStr)'],
set: 'set'
}