more tuning

src/client/ui/templates/login/template.html

@@ -16,5 +16,5 @@
 		<div class="el button btnPaypal" location="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=BR2CC82WUAVEA">Donate on Paypal</div>
 		<div class="el button btnWiki" location="http://isleward.gamepedia.com/Isleward_Wiki">Access the Wiki</div>
 	</div>
-	<div class="version">v0.1.3</div>
+	<div class="version">v0.1.4</div>
 </div>

src/client/ui/templates/smithing/smithing.js

@@ -222,11 +222,11 @@ define([
 			var imgX = -item.sprite[0] * 64;
 			var imgY = -item.sprite[1] * 64;
 
-			var spritesheet = item.spritesheet || 'items';
+			var spritesheet = item.spritesheet || '../../../images/items.png';
 			if (item.material)
-				spritesheet = 'materials';
+				spritesheet = '../../../images/materials.png';
 			else if (item.quest)
-				spritesheet = 'questItems';
+				spritesheet = '../../../images/questItems.png';
 
 			var el = $(templateItem)
 				.appendTo(container);
@@ -236,7 +236,7 @@ define([
 				.on('mousemove', this.onHover.bind(this, el, item))
 				.on('mouseleave', this.hideTooltip.bind(this, el, item))
 				.find('.icon')
-				.css('background', 'url(../../../images/' + spritesheet + '.png) ' + imgX + 'px ' + imgY + 'px');
+				.css('background', 'url(' + spritesheet + ') ' + imgX + 'px ' + imgY + 'px');
 
 			if (item.quantity) {
 				var quantityText = item.quantityText;

src/server/components/inventory.js

@@ -592,7 +592,8 @@ define([
 			this.items = [];
 
 			if ((!blueprint.noRandom) || (blueprint.alsoRandom)) {
-				var magicFind = (blueprint.magicFind || 0) + killSource.stats.values.magicFind;
+				var magicFind = (blueprint.magicFind || 0);
+				var bonusMagicFind = killSource.stats.values.magicFind;
 				for (var i = 0; i < blueprint.rolls; i++) {
 					if (Math.random() * 100 >= (blueprint.chance || 35))
 						continue;
@@ -625,7 +626,8 @@ define([
 						type: useItem.type,
 						spell: !!useItem.ability,
 						stats: useItem.stats ? Object.keys(useItem.stats) : null,
-						magicFind: magicFind
+						magicFind: magicFind,
+						bonusMagicFind: bonusMagicFind
 					};
 
 					useItem = generator.generate(itemBlueprint);

src/server/config/maps/cave/map.json

@@ -2548,7 +2548,7 @@
     {
      "instanced":"0",
      "name":"Test Zone",
-     "spawn":"[{\"x\":16,\"y\":136}, {\"source\": \"pockshell\", \"x\": 163, \"y\": 35}]"
+     "spawn":"[{\"x\":16,\"y\":136}, {\"source\": \"radulos\", \"x\": 163, \"y\": 35}]"
     },
  "propertytypes":
     {

src/server/config/maps/cave/zone.js

@@ -42,7 +42,7 @@ module.exports = {
 				range: 2,
 				selfCast: 0.2,
 				statMult: 1,
-				damage: 0.2,
+				damage: 0.225,
 				element: 'arcane',
 				cdMax: 5,
 				particles: {
@@ -112,14 +112,14 @@ module.exports = {
 				type: 'melee'
 			}, {
 				type: 'smokeBomb',
-				radius: 1,
-				duration: 10,
+				radius: 0,
+				repeat: 5,
+				duration: 7,
 				randomPos: true,
 				range: 2,
-				repeat: 2,
-				selfCast: 0.1,
+				selfCast: 0.2,
 				statMult: 1,
-				damage: 0.03,
+				damage: 0.2,
 				element: 'arcane',
 				cdMax: 5,
 				particles: {
@@ -149,16 +149,16 @@ module.exports = {
 						start: ['ff6942', 'ffeb38'],
 						end: ['953f36', '9a5a3c']
 					},
-					chance: 0.08,
+					chance: 0.125,
 					randomColor: true,
 					randomScale: true,
 					blendMode: 'add',
 					spawnType: 'rect',
 					spawnRect: {
-						x: -15,
-						y: -15,
-						w: 30,
-						h: 30
+						x: -10,
+						y: -10,
+						w: 20,
+						h: 20
 					}
 				}
 			}]
@@ -169,7 +169,13 @@ module.exports = {
 
 			regular: {
 				hpMult: 75,
-				dmgMult: 2
+				dmgMult: 2,
+
+				drops: {
+					chance: 100,
+					rolls: 5,
+					magicFind: [300, 50]
+				}
 			},
 			rare: {
 				count: 0
@@ -199,13 +205,14 @@ module.exports = {
 				}
 			}, {
 				type: 'smokeBomb',
-				radius: 2,
-				repeat: 3,
-				duration: 8,
+				radius: 1,
+				repeat: 5,
+				duration: 14,
 				randomPos: true,
 				range: 6,
+				selfCast: 0.3,
 				statMult: 1,
-				damage: 0.25,
+				damage: 0.225,
 				element: 'arcane',
 				cdMax: 8,
 				particles: {
@@ -235,16 +242,16 @@ module.exports = {
 						start: ['ff4252', 'd43346'],
 						end: ['802343', 'a82841']
 					},
-					chance: 0.03,
+					chance: 0.125,
 					randomColor: true,
 					randomScale: true,
 					blendMode: 'add',
 					spawnType: 'rect',
 					spawnRect: {
-						x: -15,
-						y: -15,
-						w: 30,
-						h: 30
+						x: -10,
+						y: -10,
+						w: 20,
+						h: 20
 					}
 				}
 			}, {

src/server/items/config/prefixes.js

@@ -5,8 +5,11 @@ define([
 ) {
 	return {
 		generic: [
+			`aether`,
 			`abyssal`,
+			`ageless`,
 			`angel%`,
+			`ancestor's`,
 			`antique`,
 			`apprentice%`,
 			`archer%`,
@@ -72,18 +75,22 @@ define([
 			`hidden`,
 			`hideous`,
 			`horizon`,
+			`hope's`,
 			`hulk`,
 			`hunter%`,
 			`ignited`,
 			`infernal`,
 			`ingenious`,
+			`inner`,
 			`inscrutable`,
 			`insolent%`,
 			`intrepid`,
 			`iron`,
 			`journeyman%`,
+			`justice`,
 			`keen`,
 			`knight%`,
+			`light's`,
 			`lingering`,
 			`living`,
 			`magi`,
@@ -91,6 +98,7 @@ define([
 			`magnificent`,
 			`majesty`,
 			`master%`,
+			`mercy%`,
 			`mysterious`,
 			`noble`,
 			`northern`,

src/server/items/config/suffixes.js

@@ -12,9 +12,12 @@ define([
 			`alacrity`,
 			`arts`,
 			`ascension`,
+			`awakening`,
 			`bite`,
 			`boon`,
 			`breath`,
+			`call`,
+			`calm`,
 			`conclave`,
 			`conqueror`,
 			`crest`,
@@ -35,21 +38,26 @@ define([
 			`gear`,
 			`gift`,
 			`glitter`,
+			`grace`,
 			`heart`,
+			`hope`,
 			`horror`,
 			`ichor`,
 			`inception`,
 			`judgment`,
+			`justice`,
 			`keeper`,
 			`knack`,
 			`legend`,
 			`light`,
 			`mercy`,
 			`mind`,
+			`might`,
 			`myth`,
 			`oblivion`,
 			`omen`,
 			`penance`,
+			`peace`,
 			`pride`,
 			`promise`,
 			`prospect`,

src/server/items/generator.js

@@ -16,7 +16,7 @@ define([
 	var spellGenerators = [g1, g8];
 
 	var generator = {
-		spellChance: 0.15,
+		spellChance: 0.03,
 		generate: function(blueprint) {
 			var hadBlueprint = !!blueprint;
 			blueprint = blueprint || {};

src/server/items/generators/quality.js

@@ -37,11 +37,17 @@ define([
 			else
 				magicFind = extend(true, [], magicFind);
 
+			var bonusMagicFind = blueprint.bonusMagicFind;
+
 			var mLen = magicFind.length
 			for (var i = 0; i < mLen; i++) {
 				qualities[i] = Math.max(0, qualities[i] - (magicFind[i] * this.magicFindMult));
-				if (qualities[i] > 0)
+				if (qualities[i] > 0) {
+					if (i == 0)
+						qualities[i] -= bonusMagicFind;
+					
 					break;
+				}
 			}
 
 			var max = qualities.reduce((p, n) => p + n);