From d5ff3c67e0bff8b14e9199b6dd796b4c3dd6e223 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Sat, 1 Apr 2023 11:26:46 +0800 Subject: [PATCH] fix POI order - should fix issues on older saves not loading POI --- .../res/adventure/Shandalar/world/black.json | 46 ++++++++-------- .../res/adventure/Shandalar/world/blue.json | 40 +++++++------- .../res/adventure/Shandalar/world/green.json | 38 ++++++------- .../res/adventure/Shandalar/world/red.json | 42 +++++++-------- .../res/adventure/Shandalar/world/waste.json | 54 +++++++++---------- .../res/adventure/Shandalar/world/white.json | 32 +++++------ 6 files changed, 126 insertions(+), 126 deletions(-) diff --git a/forge-gui/res/adventure/Shandalar/world/black.json b/forge-gui/res/adventure/Shandalar/world/black.json index 251f9841e11..9d7d12723f9 100644 --- a/forge-gui/res/adventure/Shandalar/world/black.json +++ b/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", - "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" + "Slimefoots Lair" ], "structures": [ { diff --git a/forge-gui/res/adventure/Shandalar/world/blue.json b/forge-gui/res/adventure/Shandalar/world/blue.json index dffc6f46f5c..6b50ce05983 100644 --- a/forge-gui/res/adventure/Shandalar/world/blue.json +++ b/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", - "Kiora Island", + "NestU", + "MerfolkPool", + "MerfolkPool1", + "MerfolkPool2", + "MerfolkPool3", + "MerfolkPool4", + "DjinnPalace", + "DjinnPalace1", + "Factory", + "Factory1", "MageTowerX", "MageTowerU", "MageTowerU1", @@ -91,13 +88,16 @@ "MageTowerU4", "MageTowerU5", "MageTowerU7", - "MerfolkPool", - "MerfolkPool1", - "MerfolkPool2", - "MerfolkPool3", - "MerfolkPool4", - "NestU", - "Teferi Hideout" + "CaveU", + "CaveU1", + "CaveU2", + "CaveU3", + "CaveU4", + "GitaxianLab", + "Kiora Island", + "Teferi Hideout", + "Jacehold", + "Grolnoks Bog" ], "structures": [ { diff --git a/forge-gui/res/adventure/Shandalar/world/green.json b/forge-gui/res/adventure/Shandalar/world/green.json index dc7f7432aa6..1cf54047777 100644 --- a/forge-gui/res/adventure/Shandalar/world/green.json +++ b/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,26 +105,9 @@ "CaveG8", "CaveG9", "CaveGB", - "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": [ { diff --git a/forge-gui/res/adventure/Shandalar/world/red.json b/forge-gui/res/adventure/Shandalar/world/red.json index 1f9a032cc49..7db73ab86cd 100644 --- a/forge-gui/res/adventure/Shandalar/world/red.json +++ b/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", - "YuleTown" + "Xiras Hive" ], "structures": [ { diff --git a/forge-gui/res/adventure/Shandalar/world/waste.json b/forge-gui/res/adventure/Shandalar/world/waste.json index d3e03555abc..607dc232e57 100644 --- a/forge-gui/res/adventure/Shandalar/world/waste.json +++ b/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", - "MageTowerU", - "MageTowerU1", - "MageTowerU2", - "MageTowerU3", - "MageTowerU4", - "MageTowerU5", - "MageTowerU7", - "Skep", - "Spawn", + "Kobold Mine", "Slime Cave", - "Slobads Factory", - "Waste Town Generic", - "Waste Town Identity", - "Waste Town Tribal" + "Slobads Factory" ], "structures": [ { diff --git a/forge-gui/res/adventure/Shandalar/world/white.json b/forge-gui/res/adventure/Shandalar/world/white.json index 477471ac32f..3045d192bd6 100644 --- a/forge-gui/res/adventure/Shandalar/world/white.json +++ b/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", - "Plains Town Identity", - "Plains Town Tribal", - "Plains Capital", - "White Castle" + "Nahiri Encampment", + "MageTower White" ], "structures": [ {