cleanup

helpers/passives/client/ui/factory.js

@@ -17,8 +17,8 @@ define([
 		},
 
 		build: function (type, options) {
-			var className = 'ui' + type[0].toUpperCase() + type.substr(1);
-			var el = $('.' + className);
+			let className = 'ui' + type[0].toUpperCase() + type.substr(1);
+			let el = $('.' + className);
 			if (el.length > 0)
 				return;
 
@@ -31,7 +31,7 @@ define([
 		},
 
 		onGetTemplate: function (options, template) {
-			var ui = _.create(uiBase, template);
+			let ui = $.extend(true, {}, uiBase, template);
 			ui.setOptions(options);
 			ui.render();
 			ui.el.data('ui', ui);
@@ -52,10 +52,10 @@ define([
 		},
 
 		update: function () {
-			var uis = this.uis;
-			var uLen = uis.length;
-			for (var i = 0; i < uLen; i++) {
-				var u = uis[i];
+			let uis = this.uis;
+			let uLen = uis.length;
+			for (let i = 0; i < uLen; i++) {
+				let u = uis[i];
 				if (u.update)
 					u.update();
 			}

src/client/js/components/aggro.js

@@ -1,9 +0,0 @@
-define([
-	
-], function (
-	
-) {
-	return {
-		type: 'aggro'	
-	};
-});

src/client/js/components/components.js

@@ -18,7 +18,6 @@ let components = [
 	'stats',
 	'chest',
 	'effects',
-	'aggro',
 	'quests',
 	'events',
 	'resourceNode',
@@ -28,7 +27,6 @@ let components = [
 	'chatter',
 	'dialogue',
 	'trade',
-	'prophecies',
 	'reputation',
 	'serverActions',
 	'social',
@@ -50,7 +48,11 @@ define(components, function () {
 			if (type === 'lightpatch')
 				type = 'lightPatch';
 
-			return templates[type];
+			let template = templates[type] || {
+				type: type
+			};
+
+			return template;
 		}
 	};
 });

src/client/js/components/prophecies.js

@@ -1,9 +0,0 @@
-define([
-	
-], function (
-	
-) {
-	return {
-		type: 'prophecies'
-	};
-});

src/client/js/misc/helpers.js

@@ -82,15 +82,6 @@ Object.defineProperty(Object.prototype, 'has', {
 });
 
 window._ = {
-	create: function () {
-		let result = {};
-
-		[].slice.call(arguments).forEach(function (a) {
-			$.extend(true, result, a);
-		});
-
-		return result;
-	},
 	get2dArray: function (w, h, def) {
 		def = def || 0;
 
@@ -108,15 +99,6 @@ window._ = {
 		}
 
 		return result;
-	},
-	randWeighted: function (weights) {
-		let sample = [];
-		weights.forEach(function (w, i) {
-			for (let j = 0; j < w; j++) 
-				sample.push(i);
-		});
-
-		return sample[~~(Math.random() * sample.length)];
 	}
 };
 

src/client/ui/factory.js

@@ -72,7 +72,7 @@ define([
 			require([this.root + 'ui/templates/' + type + '/' + type], this.onGetTemplate.bind(this, options));
 		},
 		onGetTemplate: function (options, template) {
-			let ui = _.create(uiBase, template);
+			let ui = $.extend(true, {}, uiBase, template);
 			ui.setOptions(options);
 			ui.render();
 			ui.el.data('ui', ui);