1 files changed, 46 insertions, 47 deletions

diff --git a/tools/gendata.js b/tools/gendata.js
index 71c3855..2620c66 100644
--- a/tools/gendata.js
+++ b/tools/gendata.js
@@ -190,70 +190,69 @@ function path(a,b) { return defway('path', a, b) }
 
 
 // LOCALES
-defloc("North", "fortress", "Bamburgh")
-defloc("North", "city", "Newcastle")
-defloc("North", "town", "Appleby")
-defloc("North", "town", "Hexham")
-defloc("North", "city", "Carlisle")
-
 
-defloc("Wales", "harlech", "Harlech")
-defloc("Wales", "fortress", "Pembroke")
-defloc("Wales", "city", "Cardiff")
-defloc("Wales", "city", "Hereford")
-defloc("Wales", "fortress", "Ludlow")
-defloc("Wales", "city", "Shrewsbury")
+defloc("England", "fortress", "Lynn")
+defloc("England", "fortress", "Ravenspur")
+defloc("England", "town", "Ipswich")
+defloc("North", "city", "Newcastle")
+defloc("North", "town", "Scarborough")
 
-defloc("South", "city", "Salisbury")
-defloc("South", "city", "Winchester")
-defloc("South", "city", "Guildford")
+defloc("England", "calais", "Calais")
+defloc("England", "city", "Exeter")
+defloc("England", "town", "Dorchester")
+defloc("England", "town", "Plymouth")
+defloc("England", "town", "Truro")
 defloc("South", "town", "Arundel")
-defloc("South", "town", "Southampton")
-defloc("South", "city", "Rochester")
 defloc("South", "town", "Dover")
-defloc("South", "city", "Canterbury")
 defloc("South", "town", "Hastings")
+defloc("South", "town", "Southampton")
 
-defloc("England", "town", "Dorchester")
-defloc("England", "city", "Exeter")
-defloc("England", "town", "Plymouth")
-defloc("England", "city", "Launceston")
-defloc("England", "town", "Truro")
-defloc("England", "city", "Wells")
 defloc("England", "city", "Bristol")
+defloc("Wales", "fortress", "Pembroke")
+defloc("Wales", "harlech", "Harlech")
+
+defloc("England", "city", "Chester")
+defloc("England", "city", "Coventry")
+defloc("England", "city", "Ely")
 defloc("England", "city", "Gloucester")
+defloc("England", "city", "Launceston")
+defloc("England", "city", "Lichfield")
+defloc("England", "city", "Lincoln")
+defloc("England", "city", "Norwich")
 defloc("England", "city", "Oxford")
-defloc("England", "town", "Newbury")
+defloc("England", "city", "Peterborough")
+defloc("England", "city", "Wells")
+defloc("England", "city", "Worcester")
+defloc("England", "city", "York")
 defloc("England", "london", "London")
-defloc("England", "town", "St Albans")
 defloc("England", "town", "Bedford")
-defloc("England", "town", "Cambridge")
 defloc("England", "town", "Bury St Edmunds")
-defloc("England", "town", "Ipswich")
-defloc("England", "city", "Norwich")
-defloc("England", "fortress", "Lynn")
-defloc("England", "city", "Ely")
-defloc("England", "city", "Peterborough")
-defloc("England", "town", "Northampton")
-defloc("England", "city", "Coventry")
-defloc("England", "town", "Leicester")
-defloc("England", "city", "Lichfield")
+defloc("England", "town", "Cambridge")
 defloc("England", "town", "Derby")
-defloc("England", "town", "Nottingham")
-defloc("England", "city", "Worcester")
-defloc("England", "city", "Chester")
 defloc("England", "town", "Lancaster")
-defloc("England", "city", "Lincoln")
-defloc("England", "city", "York")
-defloc("England", "calais", "Calais")
+defloc("England", "town", "Leicester")
+defloc("England", "town", "Newbury")
+defloc("England", "town", "Northampton")
+defloc("England", "town", "Nottingham")
+defloc("England", "town", "St Albans")
+defloc("North", "city", "Carlisle")
+defloc("North", "fortress", "Bamburgh")
+defloc("North", "town", "Appleby")
+defloc("North", "town", "Hexham")
+defloc("South", "city", "Canterbury")
+defloc("South", "city", "Guildford")
+defloc("South", "city", "Rochester")
+defloc("South", "city", "Salisbury")
+defloc("South", "city", "Winchester")
+defloc("Wales", "city", "Cardiff")
+defloc("Wales", "city", "Hereford")
+defloc("Wales", "city", "Shrewsbury")
+defloc("Wales", "fortress", "Ludlow")
 
+defloc(null, "exile_box", "Burgundy")
 defloc(null, "exile_box", "France")
-defloc(null, "exile_box", "Scotland")
 defloc(null, "exile_box", "Ireland")
-defloc(null, "exile_box", "Burgundy")
-
-defloc("North", "town", "Scarborough")
-defloc("England", "fortress", "Ravenspur")
+defloc(null, "exile_box", "Scotland")
 
 defloc(null, "sea", "English Channel")
 defloc(null, "sea", "Irish Sea")