Fixes #130

src/client/ui/templates/inventory/inventory.js

@@ -370,30 +370,6 @@ define([
 		onGetItems: function(items) {
 			this.items = items;
 
-			this.items.forEach(function(item) {
-				var prefix = -1;
-				['quest', 'material', 'ability'].forEach(function(p, i) {
-					if (item[p])
-						prefix += 1 + i;
-				});
-				if (prefix == -1)
-					prefix = 3 + item.slot + item.type;
-
-				item.sortName = prefix + item.name + item.level + item.id;
-
-				if ((item == this.hoverItem))
-					this.onHover(null, item);
-			}, this);
-
-			this.items.sort(function(a, b) {
-				if (a.sortName < b.sortName)
-					return -1;
-				else if (a.sortName > b.sortName)
-					return 1;
-				else
-					return 0;
-			});
-
 			if (this.shown)
 				this.build();
 		},

ulie

@@ -0,0 +1,95 @@
+diff --git a/src/server/config/maps/tutorial/map.json b/src/server/config/maps/tutorial/map.json
+index ca23ad6..0cd0ec9 100644
+--- a/src/server/config/maps/tutorial/map.json
++++ b/src/server/config/maps/tutorial/map.json
+@@ -787,7 +787,7 @@
+                  "gid":229,
+                  "height":8,
+                  "id":635,
+-                 "name":"Crazed Seagull",
++                 "name":"Craze",
+                  "properties":
+                     {
+ 
+@@ -1040,7 +1040,7 @@
+                  "name":"",
+                  "properties":
+                     {
+-                     "cpnNotice":"{\"maxLevel\": 1, \"msg\": \"You open your eyes and cough. Saltwater burns your throat. You remember the storm, and the crash that left your ship in pieces.<br \/><br \/>You realize you need to find shelter. Use <font class='color-green'>wasd<\/font> or the <ont class='color-green'>arrow keys<\/font> to move.\"}"
++                     "cpnNotice":"{\"msg\": \"You open your eyes and cough. Saltwater burns your throat. You remember the storm, and the crash that left your ship in pieces.<br \/><br \/>You realize you need to find shelter. Use <font class='color-green'>wasd<\/font> or the <ont class='color-green'>arrow keys<\/font> to move.\"}"
+                     },
+                  "rotation":0,
+                  "type":"",
+@@ -1055,7 +1055,7 @@
+                  "name":"",
+                  "properties":
+                     {
+-                     "cpnNotice":"{\"maxLevel\": 1, \"msg\": \"You take a few steps, still weak from the ordeal. Through the glare of the sun, you see a creature to the north-east.<br \/><br \/>Press <font class='color-green'>v<\/font> to toggle nameplates.\"}"
++                     "cpnNotice":"{\"msg\": \"You take a few steps, still weak from the ordeal. Through the glare of the sun, you see a creature to the north-east.<br \/><br \/>Press <font class='color-green'>v<\/font> to toggle nameplates.\"}"
+                     },
+                  "rotation":0,
+                  "type":"",
+@@ -1070,7 +1070,7 @@
+                  "name":"",
+                  "properties":
+                     {
+-                     "cpnNotice":"{\"maxLevel\": 1, \"msg\": \"You take a few steps, still weak from the ordeal. Through the glare of the sun, you see a creature to the north-east.<br \/><br \/>Press <font class='color-green'>v<\/font> to toggle nameplates.\"}"
++                     "cpnNotice":"{\"msg\": \"You take a few steps, still weak from the ordeal. Through the glare of the sun, you see a creature to the north-east.<br \/><br \/>Press <font class='color-green'>v<\/font> to toggle nameplates.\"}"
+                     },
+                  "rotation":0,
+                  "type":"",
+@@ -1085,7 +1085,7 @@
+                  "name":"",
+                  "properties":
+                     {
+-                     "cpnNotice":"{\"maxLevel\": 2, \"msg\": \"The seagull's eyes are bloodshot and in its beak you see a glinting locket. It stole your family heirloom!<br \/><br \/>Click on it to target it then press <font class='color-green'>1<\/font> to toggle auto-attack. Remember to stand close if you are a warrior or thief.\"}"
++                     "cpnNotice":"{\"msg\": \"The seagull's eyes are bloodshot and in its beak you see a glinting locket. It stole your family heirloom!<br \/><br \/>Click on it to target it then press <font class='color-green'>1<\/font> to toggle auto-attack. Remember to stand close if you are a warrior or thief.\"}"
+                     },
+                  "rotation":0,
+                  "type":"",
+@@ -1100,7 +1100,7 @@
+                  "name":"",
+                  "properties":
+                     {
+-                     "cpnNotice":"{\"maxLevel\": 1, \"msg\": \"You take a few steps, still weak from the ordeal. Through the glare of the sun, you see a creature to the north-east.<br \/><br \/>Press <font class='color-green'>v<\/font> to toggle nameplates.\"}"
++                     "cpnNotice":"{\"msg\": \"You take a few steps, still weak from the ordeal. Through the glare of the sun, you see a creature to the north-east.<br \/><br \/>Press <font class='color-green'>v<\/font> to toggle nameplates.\"}"
+                     },
+                  "rotation":0,
+                  "type":"",
+@@ -1115,7 +1115,7 @@
+                  "name":"",
+                  "properties":
+                     {
+-                     "cpnNotice":"{\"maxLevel\": 1, \"msg\": \"You can loot items by standing on them then open your inventory with <font class='color-green'>i<\/font>.<br \/><br \/>To equip an item, simply click on the item in your inventory.\"}"
++                     "cpnNotice":"{\"msg\": \"You can loot items by standing on them then open your inventory with <font class='color-green'>i<\/font>.<br \/><br \/>To equip an item, simply click on the item in your inventory.\"}"
+                     },
+                  "rotation":0,
+                  "type":"",
+@@ -1130,7 +1130,7 @@
+                  "name":"",
+                  "properties":
+                     {
+-                     "cpnNotice":"{\"maxLevel\": 1, \"msg\": \"You can loot items by standing on them then open your inventory with <font class='color-green'>i<\/font>.<br \/><br \/>To equip an item, simply click on the item in your inventory.\"}"
++                     "cpnNotice":"{\"msg\": \"Far to the north, you see a small shack. Civilization!<br \/><br \/> You can read more help by pressing <font class='color-green'>h<\/font>.\"}"
+                     },
+                  "rotation":0,
+                  "type":"",
+@@ -1145,7 +1145,7 @@
+                  "name":"",
+                  "properties":
+                     {
+-                     "cpnNotice":"{\"maxLevel\": 2, \"msg\": \"The seagull's eyes are bloodshot and in its beak you see a glinting locket. It stole your family heirloom!<br \/><br \/>Click on it to target it then press <font class='color-green'>1<\/font> to toggle auto-attack. Remember to stand close if you are a warrior or thief.\"}"
++                     "cpnNotice":"{\"msg\": \"The seagull's eyes are bloodshot and in its beak you see a glinting locket. It stole your family heirloom!<br \/><br \/>Click on it to target it then press <font class='color-green'>1<\/font> to toggle auto-attack. Remember to stand close if you are a warrior or thief.\"}"
+                     },
+                  "rotation":0,
+                  "type":"",
+@@ -1419,7 +1419,8 @@
+     {
+      "instanced":"0",
+      "name":"Test Zone",
+-     "spawn":"{\"x\":60,\"y\":116}"
++     "padding":"{\"tiles\":[[6,10],[7,5]]}",
++     "spawn":"{\"x\":72,\"y\":86}"
+     },
+  "renderorder":"right-down",
+  "tileheight":8,