From 8042414be74c2b00b899b4bd2f5c7fca32fc7deb Mon Sep 17 00:00:00 2001 From: Andrea Rendine Date: Wed, 29 Apr 2015 23:43:43 +0200 Subject: [PATCH] Stores alphabetical sorting The bulk of this small change was to sort stores by alphabetical order according to translated names, instead of english strings. This meant removing the ID splitting as well as hyphen/space replacing, as the ID is not considered for the test. Also changed: 1. line 800: as the original english string is no longer necessary in the iteration, k takes the value of translated string. k is then used for alphabetical comparison (as before) with the right value. 2. line 816: removed the test on curPrev variable. Items already listed have been placed in alphabetical order, so there is no need to check whether each item actually follows value of control variable. --- script/room.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/script/room.js b/script/room.js index 5be65d3b0..a6c543b9a 100644 --- a/script/room.js +++ b/script/room.js @@ -797,6 +797,7 @@ var Room = { $SM.set('stores["'+k+'"]', 0); } + k = _(k); // thieves? if(typeof $SM.get('game.thieves') == 'undefined' && num > 5000 && $SM.get('features.location.world')) { @@ -805,21 +806,21 @@ var Room = { if(row.length === 0 && num > 0) { row = $('
').attr('id', id).addClass('storeRow'); - $('
').addClass('row_key').text(_(k)).appendTo(row); + $('
').addClass('row_key').text(k).appendTo(row); $('
').addClass('row_val').text(Math.floor(num)).appendTo(row); $('
').addClass('clear').appendTo(row); var curPrev = null; location.children().each(function(i) { var child = $(this); - var cName = child.attr('id').substring(4).replace('-', ' '); - if(cName < k && (curPrev == null || cName > curPrev)) { - curPrev = cName; + var cName = child.children('.row_key').text(); + if(cName < k) { + curPrev = child.attr('id'); } }); if(curPrev == null) { row.prependTo(location); } else { - row.insertAfter(location.find('#row_' + curPrev.replace(' ', '-'))); + row.insertAfter(location.find('#' + curPrev)); } newRow = true; } else if(num>= 0){