Merge remote-tracking branch 'upstream/staging' into staging

src/client/plugins/pixi.particles.js

@@ -630,9 +630,6 @@ if (!Array.prototype.random) {
 			this.rawPosition.x += this.velocity.x * delta;
 			this.rawPosition.y += this.velocity.y * delta;
 
-			//if (isNaN(this.velocity.x))
-			//	console.log(this.startSpeed + ' ' + this.endSpeed);
-
 			this.position.x = ~~(this.rawPosition.x / 2) * 2;
 			this.position.y = ~~(this.rawPosition.y / 2) * 2;
 		}

src/server/components/dialogue.js

@@ -86,7 +86,7 @@ define([
 				console.log('NO DIALOGUE STATES?!?!??!');
 				console.log('NO DIALOGUE STATES?!?!??!');
 				console.log('NO DIALOGUE STATES?!?!??!');
-				console.log(this.obj);
+				console.log(this.obj);				
 				return null;
 			}
 			var stateConfig = this.states[state];

src/server/components/extensions/factionVendor.js

@@ -140,8 +140,13 @@ define([
 			}
 		},
 
-		canBuy: function(itemId, requestedBy) {
-			var item = this.findItem(itemId, requestedBy.name);
+		canBuy: function(itemId, requestedBy, action) {
+			var item = null;
+			if (action == 'buy')
+				item = this.findItem(itemId, requestedBy.name);
+			else if (action == 'buyback')
+				item = this.findBuyback(itemId, requestedBy.name);
+			
 			var result = requestedBy.reputation.canEquipItem(item);
 
 			if (!result) {

src/server/components/stats.js

@@ -232,11 +232,8 @@ define([
 
 				if (a.obj.stats)
 					a.obj.stats.getXp(inc);
-				else {
-					console.log('give xp to???');
-					console.log(a.obj);
-				}
-
+				
+	
 				a.obj.fireEvent('afterKillMob', target);
 			}
 

src/server/components/trade.js

@@ -134,7 +134,7 @@ define([
 				return;
 			}
 
-			if (!targetTrade.canBuy(msg.itemId, this.obj)) {
+			if (!targetTrade.canBuy(msg.itemId, this.obj, msg.action)) {
 				this.resolveCallback(msg);
 				return;
 			}
@@ -262,7 +262,7 @@ define([
 			return this.items;
 		},
 
-		canBuy: function(itemId, requestedBy) {
+		canBuy: function(itemId, requestedBy, action) {
 			return true;
 		},
 

src/server/config/spells/spellSlowBlast.js

@@ -128,7 +128,6 @@ define([
 		},
 
 		cast: function(action) {
-			console.log(1);
 			this.castingEffect = this.obj.effects.addEffect({
 				type: 'casting'
 			});

src/server/config/spells/spellWarnBlast.js

@@ -82,8 +82,6 @@ define([
 				}]
 			};
 
-			console.log(this.particles);
-
 			syncer.queue('onGetObject', effect);
 
 			this.queueCallback(this.onWarningOver.bind(this, x, y), this.delay * 350);

src/server/world/map.js

@@ -87,7 +87,7 @@ define([
 
 			mapFile = require('../config/maps/' + this.name + '/map');
 			this.mapFile = mapFile;
-
+			this.mapFile.properties = this.mapFile.properties || {};
 			mapScale = mapFile.tilesets[0].tileheight;
 
 			this.instanced = mapFile.properties.instanced;