From cf3db1444677facf9bcd254b57633e2cd0f47e90 Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Mon, 31 Dec 2018 15:14:13 -0600 Subject: [PATCH] Fixed sorting for flattened containers --- recursive-macro.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/recursive-macro.js b/recursive-macro.js index 8b277b1..bba63aa 100644 --- a/recursive-macro.js +++ b/recursive-macro.js @@ -49,7 +49,7 @@ var areas = "Small Skyscraper": 1000, "Large Skyscraper": 2000, "Train": 40, - "TrainCar": 20, + "Train Car": 20, "Parking Garage": 750, "Town": 1e7, "City": 1e9, @@ -501,7 +501,13 @@ function flatten(thing) { list.push(obj); }); - list.sort(function(x,y) { return areas[x.name] < areas[y.name] }) + list.sort(function(x,y) { + if (y.area != x.area){ + return y.area - x.area; + } else { + return x.name.localeCompare(y.name); + } + }); return new Container(list); }