Merge branch '530-runecrafter-level' into 'v0.1.10'

Resolve "Runes awarded by Runecrafter's Toil cards are always level 1"

See merge request Isleward/isleward!268

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')) {

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;
 		}
 	}
-}
+}

src/client/ui/templates/tooltipItem/templateTooltip.html

@@ -6,10 +6,10 @@
 <div class="stats">$STATS$</div>
 <div class="effects">$EFFECTS$</div>
 <div class="faction">faction: $faction$</div>
-<div class="level">level: $LEVEL$</div>
 <div class="material">crafting material</div>
 <div class="quest">quest item</div>
 <div class="spellName">$SPELLNAME$</div>
 <div class="damage">$DAMAGE$</div>
+<div class="level">level: $LEVEL$</div>
 <div class="worth"></div>
-<div class="info"><br />[shift] to compare</div>
+<div class="info"><br />[shift] to compare</div>

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('<br />' + item.spell.name)
+					.html(item.spell.name)
 					.addClass('q' + item.spell.quality)
 					.show();
 				this.tooltip.find('.damage')

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 = {

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
 				});
 			},