Merge pull request #2800 from kevlahnota/newmaster2

fix POI order

forge-gui/res/adventure/Shandalar/world/black.json

@@ -72,6 +72,28 @@
 ],
 "pointsOfInterest": [
 	"Black Castle",
+	"Swamp Town Generic",
+	"Swamp Town Identity",
+	"Swamp Town Tribal",
+	"Swamp Capital",
+	"Swamp Town2",
+	"Zombie Town",
+	"Graveyard",
+	"Graveyard1",
+	"Graveyard2",
+	"Graveyard3",
+	"Graveyard4",
+	"VampireCastle",
+	"VampireCastle1",
+	"VampireCastle2",
+	"EvilGrove",
+	"EvilGrove1",
+	"EvilGrove2",
+	"EvilGrove3",
+	"EvilGrove4",
+	"SkullCaveB",
+	"SkullCaveB1",
+	"SkullCaveB2",
 	"CaveB",
 	"CaveB1",
 	"CaveB2",
@@ -81,29 +103,7 @@
 	"CaveB6",
 	"CaveB8",
 	"CaveBA",
-	"EvilGrove",
+	"Slimefoots Lair"
-	"EvilGrove1",
-	"EvilGrove2",
-	"EvilGrove3",
-	"EvilGrove4",
-	"Graveyard",
-	"Graveyard1",
-	"Graveyard2",
-	"Graveyard3",
-	"Graveyard4",
-	"SkullCaveB",
-	"SkullCaveB1",
-	"SkullCaveB2",
-	"Slimefoots Lair",
-	"Swamp Town Generic",
-	"Swamp Town Identity",
-	"Swamp Town Tribal",
-	"Swamp Capital",
-	"Swamp Town2",
-	"VampireCastle",
-	"VampireCastle1",
-	"VampireCastle2",
-	"Zombie Town"
 ],
 "structures": [
 	{

forge-gui/res/adventure/Shandalar/world/blue.json

@@ -66,23 +66,20 @@
 ],
 "pointsOfInterest": [
 	"Blue Castle",
-	"CaveU",
-	"CaveU1",
-	"CaveU2",
-	"CaveU3",
-	"CaveU4",
-	"DjinnPalace",
-	"DjinnPalace1",
-	"Factory",
-	"Factory1",
-	"GitaxianLab",
-	"Grolnoks Bog",
 	"Island Town Generic",
 	"Island Town Identity",
 	"Island Town Tribal",
 	"Island Capital",
-	"Jacehold",
+	"NestU",
-	"Kiora Island",
+	"MerfolkPool",
+	"MerfolkPool1",
+	"MerfolkPool2",
+	"MerfolkPool3",
+	"MerfolkPool4",
+	"DjinnPalace",
+	"DjinnPalace1",
+	"Factory",
+	"Factory1",
 	"MageTowerX",
 	"MageTowerU",
 	"MageTowerU1",
@@ -91,13 +88,16 @@
 	"MageTowerU4",
 	"MageTowerU5",
 	"MageTowerU7",
-	"MerfolkPool",
+	"CaveU",
-	"MerfolkPool1",
+	"CaveU1",
-	"MerfolkPool2",
+	"CaveU2",
-	"MerfolkPool3",
+	"CaveU3",
-	"MerfolkPool4",
+	"CaveU4",
-	"NestU",
+	"GitaxianLab",
-	"Teferi Hideout"
+	"Kiora Island",
+	"Teferi Hideout",
+	"Jacehold",
+	"Grolnoks Bog"
 ],
 "structures": [
 	{

forge-gui/res/adventure/Shandalar/world/green.json

@@ -75,6 +75,23 @@
 	"Wurm"
 ],
 "pointsOfInterest": [
+	"Green Castle",
+	"Forest Capital",
+	"Forest Town Generic",
+	"Forest Town Identity",
+	"Forest Town Tribal",
+	"ElfTown",
+	"WurmPond",
+	"Kavu Lair",
+	"Grove",
+	"Grove1",
+	"Grove2",
+	"Grove3",
+	"Grove4",
+	"Grove5",
+	"Grove6",
+	"Grove7",
+	"Grove8",
 	"CatLairG",
 	"CatLairG1",
 	"CatLairG2",
@@ -88,27 +105,9 @@
 	"CaveG8",
 	"CaveG9",
 	"CaveGB",
-	"CopperhostForest",
-	"ElfTown",
-	"Forest Capital",
-	"Forest Town Generic",
-	"Forest Town Identity",
-	"Forest Town Tribal",
-	"Garruk Forest",
-	"Green Castle",
-	"Grove",
-	"Grove1",
-	"Grove2",
-	"Grove3",
-	"Grove4",
-	"Grove5",
-	"Grove6",
-	"Grove7",
-	"Grove8",
-	"Kavu Lair",
-	"Scarecrow Farm",
 	"Slime Cave",
-	"WurmPond"
+	"Garruk Forest",
+	"Scarecrow Farm"
 ],
 "structures": [
 	{

forge-gui/res/adventure/Shandalar/world/red.json

@@ -73,9 +73,29 @@
 	"Yeti"
 ],
 "pointsOfInterest": [
+	"Red Castle",
+	"Mountain Town Generic",
+	"Mountain Town Identity",
+	"Mountain Town Tribal",
+	"Mountain Capital",
+	"YuleTown",
 	"BarbarianCamp",
 	"BarbarianCamp1",
 	"BarbarianCamp2",
+	"LavaForge1",
+	"LavaForge2",
+	"Maze",
+	"Maze1",
+	"Maze2",
+	"Maze3",
+	"Fort",
+	"Fort5",
+	"SnowAbbey",
+	"SnowAbbey1",
+	"SnowAbbey2",
+	"SkullCaveR",
+	"SkullCaveR1",
+	"SkullCaveR2",
 	"CaveR",
 	"CaveR1",
 	"CaveR2",
@@ -93,30 +113,10 @@
 	"CaveRG",
 	"CaveRH",
 	"CaveRJ",
-	"Fort",
-	"Fort5",
 	"Kobold Mine",
-	"LavaForge1",
-	"LavaForge2",
-	"Maze",
-	"Maze1",
-	"Maze2",
-	"Maze3",
-	"Mountain Town Generic",
-	"Mountain Town Identity",
-	"Mountain Town Tribal",
-	"Mountain Capital",
-	"Red Castle",
-	"SkullCaveR",
-	"SkullCaveR1",
-	"SkullCaveR2",
-	"SnowAbbey",
-	"SnowAbbey1",
-	"SnowAbbey2",
 	"Temple of Chandra",
 	"Tibalts Fortress",
-	"Xiras Hive",
+	"Xiras Hive"
-	"YuleTown"
 ],
 "structures": [
 	{

forge-gui/res/adventure/Shandalar/world/waste.json

@@ -67,7 +67,32 @@
 	"Wild Rat"
 ],
 "pointsOfInterest": [
+	"Spawn",
+	"Final Castle",
 	"Colorless Castle",
+	"Skep",
+	"Waste Town Generic",
+	"Waste Town Identity",
+	"Waste Town Tribal",
+	"Fort",
+	"Fort1",
+	"Fort2",
+	"Fort3",
+	"Fort4",
+	"Fort5",
+	"Fort6",
+	"Factory",
+	"Factory1",
+	"Factory2",
+	"Factory3",
+	"MageTowerX",
+	"MageTowerU",
+	"MageTowerU1",
+	"MageTowerU2",
+	"MageTowerU3",
+	"MageTowerU4",
+	"MageTowerU5",
+	"MageTowerU7",
 	"CaveC",
 	"CaveC1",
 	"CaveC2",
@@ -83,35 +108,10 @@
 	"CaveCD",
 	"Crawlspace",
 	"Dream Halls",
-	"Factory",
-	"Factory1",
-	"Factory2",
-	"Factory3",
-	"Final Castle",
-	"Fort",
-	"Fort1",
-	"Fort2",
-	"Fort3",
-	"Fort4",
-	"Fort5",
-	"Fort6",
-	"Kobold Mine",
 	"Lich's Mirror",
-	"MageTowerX",
+	"Kobold Mine",
-	"MageTowerU",
-	"MageTowerU1",
-	"MageTowerU2",
-	"MageTowerU3",
-	"MageTowerU4",
-	"MageTowerU5",
-	"MageTowerU7",
-	"Skep",
-	"Spawn",	
 	"Slime Cave",
-	"Slobads Factory",
+	"Slobads Factory"
-	"Waste Town Generic",
-	"Waste Town Identity",
-	"Waste Town Tribal"
 ],
 "structures": [
 	{

forge-gui/res/adventure/Shandalar/world/white.json

@@ -64,12 +64,26 @@
 	"White Wiz3"
 ],
 "pointsOfInterest": [
+	"White Castle",
+	"Plains Town Generic",
+	"Plains Town Identity",
+	"Plains Town Tribal",
+	"Plains Capital",
+	"Monastery",
+	"Monastery1",
+	"Monastery2",
+	"Monastery3",
+	"Monastery4",
 	"Castle",
 	"Castle1",
 	"Castle2",
+	"Fort7",
+	"Fort8",
+	"Fort9",
 	"CatLairW",
 	"CatLairW1",
 	"CatLairW2",
+	"NestW",
 	"CaveW",
 	"CaveW1",
 	"CaveW2",
@@ -77,23 +91,9 @@
 	"CaveW4",
 	"CaveW5",
 	"CaveW6",
-	"Fort7",
-	"Fort8",
-	"Fort9",
-	"MageTower White",
-	"Monastery",
-	"Monastery1",
-	"Monastery2",
-	"Monastery3",
-	"Monastery4",
-	"Nahiri Encampment",
-	"NestW",
 	"OrthodoxyBasilica",
-	"Plains Town Generic",
+	"Nahiri Encampment",
-	"Plains Town Identity",
+	"MageTower White"
-	"Plains Town Tribal",
-	"Plains Capital",
-	"White Castle"
 ],
 "structures": [
 	{