diff --git a/src/asset/hollowknight/categories/107-comsob.json b/src/asset/hollowknight/categories/107-comsob.json index e56a6b4..310422b 100644 --- a/src/asset/hollowknight/categories/107-comsob.json +++ b/src/asset/hollowknight/categories/107-comsob.json @@ -14,19 +14,21 @@ "CrystalHeart", "TransDescendingDark", "CatacombsEntry", - "ElegantKey", + "SlyRescued", + "ShadeSoul", "EnterAnyDream", "SoulTyrantEssence", - "MaskFragment1", "Flukenest", - "TransTearWithGrub", + "MaskFragment1", + "TollBenchBasin", "BrokenVessel", "GrubBasinWings", "EnterAnyDream", "FailedChampionEssence", + "GlowingWomb", "CycloneSlash", - "NightmareLantern", - "ShapeOfUnn", + "JonisBlessing", + "Grimmchild", "MaskFragment2", "Ore2", "DeepFocus", @@ -40,9 +42,9 @@ "KingsBrand", "AbyssShriek", "ShadeCloak", - "MaskFragment5", "EnterTMG", "NotchGrimm", + "MaskFragment5", "ElderHuTrans", "MantisLords", "MaskFragment6", @@ -55,12 +57,11 @@ "GalienEssence", "Zote2", "Ore3", - "VesselFragment7", - "HiveEntry", - "EnterHiveKnight", - "Hiveblood", + "Ore4", "MarkothEssence", "QuickSlash", + "EnterHiveKnight", + "Hiveblood", "Collector", "GrubCitySpire", "Lurien", @@ -74,6 +75,7 @@ "GreyMournerSeerAscended", "FlowerQuest", "Grub46", + "GrubberflysElegy", "WhitePalaceEntry", "Kingsoul", "LifebloodCore", @@ -83,31 +85,37 @@ "HollowKnightDreamnail" ], "names": { - "CrystalHeart": "[1U] %s", - "ElegantKey": "[1U] %s", + "CrystalHeart": "[1D] %s", + "ShadeSoul": "[1U] %s", "EnterAnyDream": ["Enter Soul Tyrant", "[2D] Enter Failed Champion"], - "MaskFragment1": "Waterways Mask", - "CycloneSlash": "[2D, 2D] %s", + "MaskFragment1": "Waterways Shard", + "GlowingWomb": "[3D] %s", + "CycloneSlash": "[1U] %s", "MaskFragment2": "Enraged Guardian", "Ore2": "Crown Pale Ore", - "Vessel1": "[2D] Storerooms Fragment", + "Vessel1": "[3D] Storerooms Fragment", + "ThornsOfAgony": "[1U] %s", "VesselFragment4": "Greenpath Fragment", + "HowlingWraiths": "[2D, 2D] %s", "MaskFragment3": "No Eyes Shard", - "Vessel2": "[2U] King's Station Fragment", - "AbyssShriek": "[1U] %s", + "Vessel2": "King's Station Fragment", + "AbyssShriek": "[2D] %s", + "EnterTMG": "[3D] %s", "NotchGrimm": "Troupe Master Grimm", "MaskFragment5": "Brooding Mawlek Shard", "MaskFragment6": "Fungal Core Shard", "Ore3": "Nosk Pale Ore", - "VesselFragment7": "Deepnest Fragment", + "Ore4": "Basin Pale Ore", "ColosseumBronzeUnlocked": "Begin Colosseum Trials", "ColosseumSilverUnlocked": "Trial of the Warrior", "ColosseumGoldUnlocked": "Trial of the Conqueror", "ColosseumGoldExit": "Trial of the Fool", - "MaskFragment9": "[1D, 2D] Bretta Shard", + "MaskFragment9": "[2U, 2U] Bretta Shard", + "GreyMournerSeerAscended": "[3D] %s", "Grub46": "(Grub 46) White Lady Grub", - "WhitePalaceEntry": "[3U, 2D] White Palace", - "EnterNKG": "[3U] Enter NKG" + "GrubberflysElegy": "[3D, 2D] %s", + "WhitePalaceEntry": "Enter White Palace", + "EnterNKG": "Enter NKG" }, "endTriggeringAutosplit": false, "endingSplit": { diff --git a/src/asset/hollowknight/categories/107-everything.json b/src/asset/hollowknight/categories/107-everything.json index 13d796d..8d20217 100644 --- a/src/asset/hollowknight/categories/107-everything.json +++ b/src/asset/hollowknight/categories/107-everything.json @@ -4,6 +4,8 @@ "VengefulSpirit", "EnterGreenpath", "-Zote1", + "-GrubGreenpathMossKnight", + "-GreenpathStation", "MothwingCloak", "MantisClaw", "-Dashmaster", @@ -31,38 +33,34 @@ "CatacombsEntry", "-SoulEater", "-NotchSalubra1", - "-SlyRescued", + "SlyRescued", "-GrubCrossroadsSpikes", "-GrubCrossroadsWall", - "ElegantKey", - "-ShadeSoul", + "-ElegantKey", + "ShadeSoul", "EnterAnyDream", "SoulTyrantEssence", "-GrubCityBelowSanctum", + "Flukenest", "-GrubWaterwaysCenter", "MaskFragment1", - "Flukenest", "-DefendersCrest", - "-GrubWaterwaysIsma", - "TransTearWithGrub", - "-TollBenchBasin", + "TollBenchBasin", "BrokenVessel", "-LostKinEssence", "GrubBasinWings", - "-GlowingWomb", "EnterAnyDream", "FailedChampionEssence", "-DreamGate", + "GlowingWomb", "CycloneSlash", "-GorbEssence", "-VesselFragment2", - "-JonisBlessing", - "NightmareLantern", + "JonisBlessing", + "-NightmareLantern", "-GrubCliffsBaldurShell", "-BaldurShell", - "-GrubGreenpathMossKnight", - "ShapeOfUnn", - "-Grimmchild", + "Grimmchild", "-GrubCrystalPeaksMimics", "-Flame1", "-CrystalGuardian1", @@ -81,7 +79,7 @@ "-MegaMossCharger", "-GrubGreenpathVesselFragment", "VesselFragment4", - "VesselFragment5", + "-VesselFragment5", "-Grimmchild2", "-FuryOfTheFallen", "-Flame1", @@ -91,17 +89,20 @@ "-Xero", "-Flame2", "Vessel2", + "-KingsStationStation", "-Flame3", "EnterHornet2", "KingsBrand", "AbyssShriek", "ShadeCloak", + "-IsmasTear", + "-GrubWaterwaysIsma", + "EnterTMG", + "NotchGrimm", "-OnObtainRancidEgg", "-GrubCrossroadsVengefly", "MaskFragment5", "-FragileStrength", - "EnterTMG", - "NotchGrimm", "ElderHuTrans", "-GrubFungalBouncy", "MantisLords", @@ -132,15 +133,9 @@ "-GrubDeepnestNosk", "Ore3", "-SharpShadow", - "VesselFragment7", + "-VesselFragment7", "-GrubBasinDive", - "-Ore4", - "HiveEntry", - "-Flame3", - "-GrubHiveInternal", - "-Mask2", - "EnterHiveKnight", - "Hiveblood", + "Ore4", "-GrubWaterwaysHwurmps", "-GrubHiveExternal", "-GrubKingdomsEdgeCenter", @@ -148,6 +143,11 @@ "-DashSlash", "-GrubKingdomsEdgeOro", "QuickSlash", + "-Flame3", + "-GrubHiveInternal", + "-Mask2", + "EnterHiveKnight", + "Hiveblood", "Collector", "-GrubCityCollectorAll", "-GrubCityBelowLoveTower", @@ -156,7 +156,6 @@ "Lurien", "NailUpgrade3", "WhiteDefenderEssence", - "-KingsStationStation", "ColosseumBronzeUnlocked", "ColosseumSilverUnlocked", "ColosseumGoldUnlocked", @@ -164,6 +163,7 @@ "-WaywardCompass", "-GreyPrinceEssence", "MaskFragment9", + "-ShapeOfUnn", "-Dreamshield", "-SeerDeparts", "-GrubRestingGroundsCrypts", @@ -178,7 +178,7 @@ "Grub46", "-WhiteFragmentLeft", "-Mask3", - "-GrubberflysElegy", + "GrubberflysElegy", "-NailUpgrade4", "WhitePalaceEntry", "Kingsoul", @@ -192,31 +192,31 @@ "HollowKnightDreamnail" ], "names": { - "GrubCrossroadsGuarded": "[1U] %s", - "ElegantKey": "{Elegant Key} [1U] %s", - "EnterAnyDream": ["Enter Soul Tyrant", "Enter Failed Champion"], + "GrubCrossroadsGuarded": "[1D] %s", + "ElegantKey": "[1U] %s", + "EnterAnyDream": ["Enter Soul Tyrant", "[2D] Enter Failed Champion"], "MaskFragment1": "Waterways Shard", - "GlowingWomb": "[2D] %s", - "DreamGate": "[2D] %s", - "CycloneSlash": "{Cyclone Slash} [2D] %s", + "DreamGate": "[3D] %s", + "CycloneSlash": "{Cyclone Slash} [1U] %s", "VesselFragment2": "Stag Nest Fragment", "Flame1": ["Peak Flame", "King's Pass Flame", "Fungal Core Flame"], "MaskFragment2": "Enraged Guardian", "Ore2": "Crown Pale Ore", - "Flame2": ["[2D] Storerooms Flame", "Resting Grounds Flame"], + "Flame2": ["[3D] Storerooms Flame", "Resting Grounds Flame"], "Vessel1": "Storerooms Fragment", + "GreatSlash": "[1U] %s", "Flame3": ["Greenpath Flame", "Kingdom's Edge Flame", "Hive Flame"], "VesselFragment4": "Greenpath Fragment", - "VesselFragment5": "Lantern + Sly Fragment", + "VesselFragment5": "[2D, 2D] Lantern + Sly Fragment", "MaskFragment3": "No Eyes Shard", - "Xero": "[2U] %s", "Vessel2": "King's Station Fragment", - "AbyssShriek": "[1U] %s", - "OnObtainRancidEgg": "Grubfather (4 tosses after egg)", + "AbyssShriek": "[2D] %s", + "EnterTMG": "{Enter Grimm} [3D] Enter Grimm", "NotchGrimm": "Troupe Master Grimm", + "OnObtainRancidEgg": "Grubfather (4 tosses after egg)", "MaskFragment5": "Brooding Mawlek Shard", - "MaskFragment6": "Fungal Core Shard", "FragileStrength": "Leg Eater", + "MaskFragment6": "Fungal Core Shard", "MaskFragment7": "Queen's Station Shard", "Ore3": "Nosk Pale Ore", "VesselFragment7": "Deepnest Fragment", @@ -226,17 +226,18 @@ "ColosseumSilverUnlocked": "Trial of the Warrior", "ColosseumGoldUnlocked": "Trial of the Conqueror", "ColosseumGoldExit": "Trial of the Fool", - "WaywardCompass": "[1D, 2D] %s", + "WaywardCompass": "[2U, 2U] %s", "MaskFragment9": "Bretta Shard", + "Dreamshield": "[3D] %s", "NotchSalubra2": "Salubra", "MaskFragment11": "Crossroads Shard", "Grub46": "(Grub 46) White Lady Grub", "Mask3": "Grey Mourner Shard", - "GrubberflysElegy": "[3U] %s", - "WhitePalaceEntry": "{White Palace} [2D] White Palace", + "GrubberflysElegy": "{Grubberfly's Elegy} [3D] %s", + "WhitePalaceEntry": "{White Palace} [2D] Enter White Palace", "VesselFragment8": "Basin Fragment", - "NailmastersGlory": "[3U] %s", - "Vessel3": "Sly" + "Vessel3": "Sly", + "EnterNKG": "Enter NKG" }, "endTriggeringAutosplit": false, "endingSplit": { diff --git a/src/asset/hollowknight/categories/107-reroute.json b/src/asset/hollowknight/categories/107-reroute.json deleted file mode 100644 index 04a918c..0000000 --- a/src/asset/hollowknight/categories/107-reroute.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "categoryName": "107% AB", - "splitIds": [ - "VengefulSpirit", - "EnterGreenpath", - "MothwingCloak", - "MantisClaw", - "BrettaRescued", - "CityGateOpen", - "EnterSanctum", - "EnterSoulMaster", - "DesolateDive", - "StoreroomsStation", - "CrystalHeart", - "TransDescendingDark", - "CatacombsEntry", - "SlyRescued", - "ShadeSoul", - "EnterAnyDream", - "SoulTyrantEssence", - "Flukenest", - "MaskFragment1", - "TollBenchBasin", - "BrokenVessel", - "GrubBasinWings", - "EnterAnyDream", - "FailedChampionEssence", - "GlowingWomb", - "CycloneSlash", - "JonisBlessing", - "Grimmchild", - "MaskFragment2", - "Ore2", - "DeepFocus", - "Vessel1", - "ThornsOfAgony", - "VesselFragment4", - "HowlingWraiths", - "MaskFragment3", - "Vessel2", - "EnterHornet2", - "KingsBrand", - "AbyssShriek", - "ShadeCloak", - "EnterTMG", - "NotchGrimm", - "MaskFragment5", - "ElderHuTrans", - "MantisLords", - "MaskFragment6", - "TeachersArchive", - "Monomon", - "LoveKey", - "QueensGardensPostArenaTransition", - "MarmuEssence", - "Hegemol", - "GalienEssence", - "Zote2", - "Ore3", - "Ore4", - "MarkothEssence", - "QuickSlash", - "EnterHiveKnight", - "Hiveblood", - "Collector", - "GrubCitySpire", - "Lurien", - "NailUpgrade3", - "WhiteDefenderEssence", - "ColosseumBronzeUnlocked", - "ColosseumSilverUnlocked", - "ColosseumGoldUnlocked", - "ColosseumGoldExit", - "MaskFragment9", - "GreyMournerSeerAscended", - "FlowerQuest", - "Grub46", - "GrubberflysElegy", - "WhitePalaceEntry", - "Kingsoul", - "LifebloodCore", - "VoidHeart", - "EnterNKG", - "NightmareKingGrimm", - "HollowKnightDreamnail" - ], - "names": { - "CrystalHeart": "[1D] %s", - "EnterAnyDream": ["Enter Soul Tyrant", "[2D] Enter Failed Champion"], - "MaskFragment1": "Waterways Mask", - "GlowingWomb": "[3D] %s", - "CycloneSlash": "[1U] %s", - "MaskFragment2": "Enraged Guardian", - "Ore2": "Crown Pale Ore", - "Vessel1": "[3D] Storerooms Vessel", - "ThornsOfAgony": "[1U] %s", - "VesselFragment4": "Greenpath Fragment", - "HowlingWraiths": "[2D, 2D] %s", - "MaskFragment3": "No Eyes Shard", - "Vessel2": "King's Station Fragment", - "AbyssShriek": "[2D] %s", - "EnterTMG": "[3D] %s", - "NotchGrimm": "Troupe Master Grimm", - "MaskFragment5": "Brooding Mawlek Shard", - "MaskFragment6": "Fungal Core Shard", - "Ore3": "Nosk Pale Ore", - "Ore4": "Basin Pale Ore", - "ColosseumBronzeUnlocked": "Begin Colosseum Trials", - "ColosseumSilverUnlocked": "Trial of the Warrior", - "ColosseumGoldUnlocked": "Trial of the Conqueror", - "ColosseumGoldExit": "Trial of the Fool", - "MaskFragment9": "[1D, 2D] Bretta Shard", - "Grub46": "(Grub 46) White Lady Grub", - "GrubberflysElegy": "[3D, 2D] %s", - "WhitePalaceEntry": "Enter White Palace", - "EnterNKG": "Enter NKG" - }, - "endTriggeringAutosplit": false, - "endingSplit": { - "name": "Dream No More", - "icon": "RadianceBoss" - }, - "gameName": "Hollow Knight" -} diff --git a/src/asset/hollowknight/categories/category-directory.json b/src/asset/hollowknight/categories/category-directory.json index e24932d..25b0e9e 100644 --- a/src/asset/hollowknight/categories/category-directory.json +++ b/src/asset/hollowknight/categories/category-directory.json @@ -7,22 +7,18 @@ "routeNotesURL": "https://pastebin.com/mw02X1Dz" } }, - { - "fileName": "107-reroute", - "displayName": "107% AB (new route)" - }, { "fileName": "107-comsob", "displayName": "107% AB (comsob splits)", "data": { - "routeNotesURL": "https://pastebin.com/WxVp46sq" + "routeNotesURL": "https://pastebin.com/6qmm9gwv" } }, { "fileName": "107-everything", "displayName": "107% AB (all splits)", "data": { - "routeNotesURL": "https://pastebin.com/WxVp46sq" + "routeNotesURL": "https://pastebin.com/6qmm9gwv" } }, {