From c4535c029a7480d2a916b8e2293f4677c57331d4 Mon Sep 17 00:00:00 2001 From: Andrea Rendine Date: Mon, 18 May 2015 19:39:12 +0200 Subject: [PATCH] Alphabetical order for workers I had missed this completely. Workers are listed in alphabetical order in English. Now they are ordered in other languages too. Alphabetical order for outfit --- script/outside.js | 17 +++++++---------- script/path.js | 13 ++++++------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/script/outside.js b/script/outside.js index 8fa2ee5..039ba87 100644 --- a/script/outside.js +++ b/script/outside.js @@ -242,6 +242,7 @@ var Outside = { var gatherer = $('div#workers_row_gatherer', workers); for(var k in $SM.get('game.workers')) { + var lk = _(k); var workerCount = $SM.get('game.workers["'+k+'"]'); var row = $('div#workers_row_' + k.replace(' ', '-'), workers); if(row.length === 0) { @@ -250,23 +251,19 @@ var Outside = { var curPrev = null; workers.children().each(function(i) { var child = $(this); - var cName = child.attr('id').substring(12).replace('-', ' '); + var cName = child.children('.row_key').text(); if(cName != 'gatherer') { - if(cName < k && (curPrev == null || cName > curPrev)) { - curPrev = cName; + if(cName < lk) { + curPrev = child.attr('id'); } } }); if(curPrev == null && gatherer.length === 0) { row.prependTo(workers); - } - else if(curPrev == null) - { + } else if(curPrev == null) { row.insertAfter(gatherer); - } - else - { - row.insertAfter(workers.find('#workers_row_' + curPrev.replace(' ', '-'))); + } else { + row.insertAfter(workers.find('#'+ curPrev)); } } else { diff --git a/script/path.js b/script/path.js index be5be51..d675672 100644 --- a/script/path.js +++ b/script/path.js @@ -174,6 +174,7 @@ var Path = { }, Room.Craftables); for(var k in carryable) { + var lk = _(k); var store = carryable[k]; var have = $SM.get('stores["'+k+'"]'); var num = Path.outfit[k]; @@ -190,18 +191,16 @@ var Path = { outfit.children().each(function(i) { var child = $(this); if(child.attr('id').indexOf('outfit_row_') === 0) { - var cName = child.attr('id').substring(11).replace('-', ' '); - if(cName < k && (curPrev == null || cName > curPrev)) { - curPrev = cName; + var cName = child.children('.row_key').text(); + if(cName < lk) { + curPrev = child.attr('id'); } } }); if(curPrev == null) { row.insertAfter(wRow); - } - else - { - row.insertAfter(outfit.find('#outfit_row_' + curPrev.replace(' ', '-'))); + } else { + row.insertAfter(outfit.find('#' + curPrev)); } } else { $('div#' + row.attr('id') + ' > div.row_val > span', outfit).text(num);