Line 122: |
Line 122: |
| local fleets = groups[fleetType] | | local fleets = groups[fleetType] |
| table.sort(fleets, function(a, b) | | table.sort(fleets, function(a, b) |
| + | local node1 = U.ijoin(a.notes, ', ') |
| + | local node2 = U.ijoin(b.notes, ', ') |
| local l1 = table.getn(a.fleet) | | local l1 = table.getn(a.fleet) |
| local l2 = table.getn(b.fleet) | | local l2 = table.getn(b.fleet) |
| local ships1 = U.ijoin(U.imap(a.fleet, function (e) return e.ship end), ', ') | | local ships1 = U.ijoin(U.imap(a.fleet, function (e) return e.ship end), ', ') |
| local ships2 = U.ijoin(U.imap(b.fleet, function (e) return e.ship end), ', ') | | local ships2 = U.ijoin(U.imap(b.fleet, function (e) return e.ship end), ', ') |
− | if ships1 == ships2 then | + | if node1 == node2 then |
− | return l1 < l2
| + | if ships1 == ships2 then |
| + | return l1 < l2 |
| + | end |
| + | return ships1 < ships2 |
| end | | end |
− | return ships1 < ships2 | + | return node1 < node2 |
| end) | | end) |
| table.insert(result, string.format('{{!}}-{{!}} %s =', fleetType)) | | table.insert(result, string.format('{{!}}-{{!}} %s =', fleetType)) |