diff --git a/src/client/ui/templates/inventory/inventory.js b/src/client/ui/templates/inventory/inventory.js
index db07161d..34a2c00f 100644
--- a/src/client/ui/templates/inventory/inventory.js
+++ b/src/client/ui/templates/inventory/inventory.js
@@ -508,6 +508,8 @@ define([
return;
else if ((action == 'equip') && ((item.material) || (item.quest) || (item.type == 'mtx') || (item.level > playerLevel)))
return;
+ else if ((action == 'learnAbility') && (item.level > playerLevel))
+ return;
else if ((action == 'activateMtx') && (item.type != 'mtx'))
return;
if ((item.factions) && (action == 'equip')) {
diff --git a/src/client/ui/templates/tooltipItem/styles.less b/src/client/ui/templates/tooltipItem/styles.less
index 37796c71..f845f6a0 100644
--- a/src/client/ui/templates/tooltipItem/styles.less
+++ b/src/client/ui/templates/tooltipItem/styles.less
@@ -52,6 +52,7 @@
}
.level {
+ margin-top: 8px;
color: darken(@white, 40%);
&.high-level {
@@ -89,4 +90,4 @@
display: none;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/client/ui/templates/tooltipItem/templateTooltip.html b/src/client/ui/templates/tooltipItem/templateTooltip.html
index 9e2c01e9..a4ff97d6 100644
--- a/src/client/ui/templates/tooltipItem/templateTooltip.html
+++ b/src/client/ui/templates/tooltipItem/templateTooltip.html
@@ -6,10 +6,10 @@
$STATS$
$EFFECTS$
faction: $faction$
-level: $LEVEL$
crafting material
quest item
$SPELLNAME$
$DAMAGE$
+level: $LEVEL$
-
[shift] to compare
\ No newline at end of file
+
[shift] to compare
diff --git a/src/client/ui/templates/tooltipItem/tooltipItem.js b/src/client/ui/templates/tooltipItem/tooltipItem.js
index 8a427da4..d2c61dbd 100644
--- a/src/client/ui/templates/tooltipItem/tooltipItem.js
+++ b/src/client/ui/templates/tooltipItem/tooltipItem.js
@@ -156,7 +156,7 @@ define([
if (item.level > level)
this.tooltip.find('.level').addClass('high-level');
- if ((item.material) || (item.quest) || (item.ability)) {
+ if ((item.material) || (item.quest)) {
this.tooltip.find('.level').hide();
this.tooltip.find('.info').hide();
@@ -174,7 +174,7 @@ define([
if (item.spell) {
this.tooltip.find('.spellName')
- .html('
' + item.spell.name)
+ .html(item.spell.name)
.addClass('q' + item.spell.quality)
.show();
this.tooltip.find('.damage')
diff --git a/src/server/components/inventory.js b/src/server/components/inventory.js
index 98e5a0bb..ab5c1192 100644
--- a/src/server/components/inventory.js
+++ b/src/server/components/inventory.js
@@ -145,11 +145,15 @@ define([
}
var item = this.findItem(itemId);
+ var statValues = this.obj.stats.values;
if (!item)
return;
else if (!item.spell) {
item.eq = false;
return;
+ } else if (item.level > (statValues.originalLevel || statValues.level)) {
+ item.eq = false;
+ return;
}
var learnMsg = {
diff --git a/src/server/mods/feature-cards/cards.js b/src/server/mods/feature-cards/cards.js
index 510e9fbb..f80824ec 100644
--- a/src/server/mods/feature-cards/cards.js
+++ b/src/server/mods/feature-cards/cards.js
@@ -6,7 +6,7 @@ define([
var config = {
'Runecrafter\'s Toil': {
chance: 0.025,
- reward: 'Rune',
+ reward: 'Level 10 Rune',
setSize: 3,
mobLevel: [3, 100]
},
@@ -124,12 +124,13 @@ define([
looter.instance.eventEmitter.emit('onBeforeGetCardReward', msg);
- return msg.handler();
+ return msg.handler(looter);
},
rewards: {
- 'Rune': function () {
+ 'Level 10 Rune': function (obj) {
return itemGenerator.generate({
+ level: 10,
spell: true
});
},