From 04404c22330cdb19d3d7923cf4e5b03bb737921e Mon Sep 17 00:00:00 2001 From: isark Date: Wed, 16 Aug 2023 19:59:00 +0200 Subject: [PATCH] moved base_plan, tweaked a lot of stuff to be a bit clearer and less funky --- base_plan.json | 1 - data/base_plan.json | 705 ++++++++++++++++++ src/app/app.component.html | 8 +- src/app/carousel/carousel.component.html | 2 +- .../plan-display/plan-display.component.html | 16 +- .../plan-display/plan-display.component.scss | 63 +- .../plan-display/plan-display.component.ts | 26 +- src/app/services/overlay.service.ts | 3 + src/app/settings/settings.component.html | 2 +- src/app/settings/settings.component.scss | 4 + src/app/settings/settings.component.ts | 2 +- src/assets/material-settings.svg | 6 +- src/styles.scss | 4 + 13 files changed, 804 insertions(+), 38 deletions(-) delete mode 100644 base_plan.json create mode 100644 data/base_plan.json diff --git a/base_plan.json b/base_plan.json deleted file mode 100644 index d5f1d99..0000000 --- a/base_plan.json +++ /dev/null @@ -1 +0,0 @@ -{"plan":[{"area_key":"1_1_1","notes":"Kill hillock"},{"area_key":"1_1_town","notes":"Tarkleigh reward"},{"area_key":"1_1_2","notes":"Waypoint"},{"area_key":"1_1_3","notes":"3x eggs, then passage"},{"area_key":"1_1_4_1","notes":"WP to coast"},{"area_key":"1_1_2","notes":""},{"area_key":"1_1_2a","notes":"Kill Hailrake then (DC/Portal)"},{"area_key":"1_1_4_1","notes":""},{"area_key":"1_1_5","notes":""},{"area_key":"1_1_6","notes":""},{"area_key":"1_1_7_1","notes":"Get WP then back to submerged passage"},{"area_key":"1_1_4_1","notes":""},{"area_key":"1_1_4_0","notes":"Kill Dweller of the Deep then DC/TP"},{"area_key":"1_1_7_1","notes":"TRIAL!"},{"area_key":"1_1_7_2","notes":"Warden's quarters -> Warden's chambers -> kill brutus"},{"area_key":"1_1_8","notes":""},{"area_key":"1_1_9","notes":"Waypoint"},{"area_key":"1_1_11_1","notes":"Waypoint"},{"area_key":"1_1_9","notes":"Find the cave"},{"area_key":"1_1_9a","notes":"Get the allflame"},{"area_key":"1_1_9","notes":"Kill fairgraves, DC/TP/WP to next"},{"area_key":"1_1_11_1","notes":""},{"area_key":"1_1_11_2","notes":"Find merveil's lair, kill merveil"},{"area_key":"1_2_1","notes":""},{"area_key":"1_2_town","notes":""},{"area_key":"1_2_7","notes":"Waypoint"},{"area_key":"1_2_12","notes":"Waypoint\nBandit Oak, kill or help"},{"area_key":"1_2_7","notes":""},{"area_key":"1_2_9","notes":"Waypoing along road\nWeaver first (look for spiderwebs along a side)"},{"area_key":"1_2_10","notes":""},{"area_key":"1_2_9","notes":"Bandit Alira, kill or help\nKill blackguards\nDC/TP/WP"},{"area_key":"1_2_2","notes":"Optional: The Den, kill the white beast"},{"area_key":"1_2_3","notes":"Waypoint"},{"area_key":"1_2_15","notes":""},{"area_key":"1_2_5_1","notes":"Waypoint\nTrial\nOptional quest in crypt level 2\nDC/TP/WP"},{"area_key":"1_2_3","notes":""},{"area_key":"1_2_4","notes":"Waypoint\nBandit Kraityn, kill or help\nDC/TP/WP"},{"area_key":"1_2_3","notes":""},{"area_key":"1_2_6_1","notes":"Waypoint"},{"area_key":"1_2_6_2","notes":"TRIAL!\nHelena\nDC/TP/WP"},{"area_key":"1_2_12","notes":"Close to waypoint"},{"area_key":"1_2_11","notes":"open the seal and continue"},{"area_key":"1_2_8","notes":"Waypoint"},{"area_key":"1_2_14_2","notes":"Crafting recipe"},{"area_key":"1_2_14_3","notes":"DON'T MISS RECIPE\nKill the Vall oversoul"},{"area_key":"1_3_1","notes":"Clarissa on the way to town"},{"area_key":"1_3_town","notes":""},{"area_key":"1_3_2","notes":"Remember where sewers is for when you got the keys!"},{"area_key":"1_3_3_1","notes":"Waypoint\nTRIAL!\nPiety\nRecipe\nDC/TP/WP"},{"area_key":"1_3_1","notes":"Get sewer keys"},{"area_key":"1_3_2","notes":"Open the sewer with keys from town"},{"area_key":"1_3_10_1","notes":"1 bust before rest\nWaypoint\nremaining 2 busts"},{"area_key":"1_3_5","notes":"Waypoint\nOptionally get decanter spiritus for swig of hope quest"},{"area_key":"1_3_6","notes":"TRIAL!\nRecipe\nDC/TP/WP"},{"area_key":"1_3_5","notes":""},{"area_key":"1_3_7","notes":"Get ribbon spool and waypoint \n(down left)\nDocks up left"},{"area_key":"1_3_9","notes":"Find infernal talc\nOptionally find waypoint and fairgraves for part of swig of hope quest"},{"area_key":"1_3_7","notes":"Solaris temple up to the right kind of compared to docks"},{"area_key":"1_3_8_1","notes":""},{"area_key":"1_3_8_2","notes":"Dialla\nRecipe in the room on the side"},{"area_key":"1_3_10_1","notes":"Unblock the place close to waypoint\nRecipe\nEbony barracks"},{"area_key":"1_3_13","notes":"Waypoint"},{"area_key":"1_3_14_1","notes":""},{"area_key":"1_3_14_2","notes":"Piety,\nRecipe\nDC/TP/WP"},{"area_key":"1_3_13","notes":"gardens around east"},{"area_key":"1_3_15","notes":"Follow path\nWaypoint\n\nLibrary top left(?) (optional quest for gem shop)\nTRIAL! bit top right compared to library (?)\n\nOptional chitus plum (quest for fairgraves done)\n\nSceptre of god (lower) (follow main path after waypoint)"},{"area_key":"1_3_18_1","notes":""},{"area_key":"1_3_18_2","notes":""},{"area_key":"1_4_1","notes":""},{"area_key":"1_4_town","notes":""},{"area_key":"1_4_2","notes":"Kill Voll\nRecipe\nDC/TP"},{"area_key":"1_4_3_1","notes":""},{"area_key":"1_4_3_2","notes":"Deshret's spirit\nThen crystal veins"},{"area_key":"1_4_3_3","notes":"Recipe\nWaypoint\n(Potentially do lab now)\nKill kaom and daresso"},{"area_key":"1_4_6_1","notes":""},{"area_key":"1_4_6_2","notes":"Belly of the beast\nKill piety\nRecipe"},{"area_key":"1_4_6_3","notes":"Waypoint\n\nKill the 3 guardians\n\nBlack core, kill malachai!\n\nDC/TP/WP"},{"area_key":"1_4_7","notes":"Recipe\nOriath portal"},{"area_key":"1_5_1","notes":"Kill overseer Crow\nLadder drops down nearby when you go close"},{"area_key":"1_5_town","notes":"Town! :D"},{"area_key":"1_5_2","notes":"Miasmeter down left\nkill Justicar"},{"area_key":"1_5_3","notes":"Waypoint"},{"area_key":"1_5_4","notes":""},{"area_key":"1_5_5","notes":"Recipe\nWaypoint\nKill high templar avarius\nDC/TP/WP"},{"area_key":"1_5_4b","notes":""},{"area_key":"1_5_3b","notes":"North east = Torched Courts (you come from here)\nNorth west = Ossuary (waypoint)"},{"area_key":"1_5_6","notes":"Recipe\nSign of Purity\nDC/TP/WP/Exit"},{"area_key":"1_5_3b","notes":"Kill Utula\nThen go to Reliquary\nEast = Utula\nSouth east = Reliquary"},{"area_key":"1_5_7","notes":"Recipe\nTorments in 3 '\"corners\" \nDC/TP/WP"},{"area_key":"1_5_3b","notes":"North west = Ossuary (waypoint)\nWest = Cathedral rooftop"},{"area_key":"1_5_8","notes":"Find cathedral apex\nKill Kitava!"},{"area_key":"2_6_town","notes":"Down left (back to strand)"},{"area_key":"2_6_1","notes":"Kill all monster on the strand, unique at end\nDC/TP/WP/go back"},{"area_key":"2_6_town","notes":"Potentially you'd want to buy a bunch of gems from"},{"area_key":"2_6_2","notes":"Waypoint"},{"area_key":"2_6_4","notes":"Kill the forgotten warrior \nThen karui fortress"},{"area_key":"2_6_5","notes":"kill tukohama in his keep\nRecipe inside the keep!!!"},{"area_key":"2_6_6","notes":"Waypoint"},{"area_key":"2_6_7_1","notes":"Recipe\nWaypoint\nTRIAL!"},{"area_key":"2_6_7_2","notes":"Ascend the tower and kill brutus+shavronne!\nRecipe in Warden's Chambers afterwards"},{"area_key":"2_6_8","notes":"Waypoint\nValley of the firedrinker (kill abberath)\nDC/TP/WP"},{"area_key":"2_6_9","notes":"Recipe\nWaypoint"},{"area_key":"2_6_10","notes":"Waypoint"},{"area_key":"2_6_11","notes":"Find spawning grounds and kill Puppet Mistress\nDC/TP"},{"area_key":"2_6_10","notes":""},{"area_key":"2_6_12","notes":"Waypoint"},{"area_key":"2_6_13","notes":""},{"area_key":"2_6_14","notes":"Recipe\nWaypoint"},{"area_key":"2_6_15","notes":"Find and kill the Brine king"},{"area_key":"2_7_1","notes":""},{"area_key":"2_7_2","notes":"Waypoint"},{"area_key":"2_7_3","notes":""},{"area_key":"2_7_4","notes":"Recipe\nWaypoint\nTRIAL!\nMaligaro's Map\nDC/TP/WP"},{"area_key":"2_7_2","notes":""},{"area_key":"2_7_5_1","notes":"Waypoint\nRecipe\nMaligaro's map for sanctum"},{"area_key":"2_7_5_map","notes":"Kill maligaro\nREMEMBER to take black venom from the spider"},{"area_key":"2_7_5_1","notes":""},{"area_key":"2_7_5_2","notes":"TRIAL!\nRecipe"},{"area_key":"2_7_6","notes":""},{"area_key":"2_7_7","notes":"Waypoint\nFind and kill Greust (Fortress Encampment)"},{"area_key":"2_7_8","notes":"Optionally find the shrine, go to town get greust's necklace and then put it on the shrine\n(amulet reward quest)"},{"area_key":"2_7_9","notes":"Collect fireflies\nRecipe\nKill the Gruthkul\nDC/TP/EXIT"},{"area_key":"2_7_8","notes":""},{"area_key":"2_7_10","notes":"Waypoint\nRecipe\nKishara's Star"},{"area_key":"2_7_11","notes":"Waypoint\nFind Yeena"},{"area_key":"2_7_12_1","notes":""},{"area_key":"2_7_12_2","notes":"Recipe\nArakaali's web, kill arakali"},{"area_key":"2_8_1","notes":"Waypoint"},{"area_key":"2_8_town","notes":""},{"area_key":"2_8_2_1","notes":""},{"area_key":"2_8_2_2","notes":"Recipe\nLoose Crate\nKill Doedre the vile\n\nSewer outlet leads to next + waypoint"},{"area_key":"2_8_8","notes":"Closer to the entry of the quay than grain gate is a long bridge to find ressurection site (Tolman)\n"},{"area_key":"2_8_9","notes":"Kill gemling legionnaires\nContinue from that area to find next place"},{"area_key":"2_8_10","notes":"Follow road for Waypoint"},{"area_key":"2_8_12_1","notes":"Waypoint"},{"area_key":"2_8_12_2","notes":"Kill Dawn\nRECIPE\nDC/TP\n(we're going to doedre's cesspool through waypoint)"},{"area_key":"2_8_2_2","notes":""},{"area_key":"2_8_3","notes":""},{"area_key":"2_8_5","notes":"Kill the boss to get the quest item\nTRIAL!\nRecipe"},{"area_key":"2_8_4","notes":"Kill yuuuuguuulll!!! :D\nDC/TP"},{"area_key":"2_8_5","notes":""},{"area_key":"2_8_6","notes":"Waypoint (up left kinda)"},{"area_key":"2_8_7_1_","notes":"Waypoint"},{"area_key":"2_8_7_2","notes":"Kill Dusk!\nRECIPE!\nDC/TP"},{"area_key":"2_8_6","notes":"(Down right kinda)"},{"area_key":"2_8_13","notes":"Kill the sun and moon false gods ;D"},{"area_key":"2_9_1","notes":"If for whatever reason you'd want to level a bit, this place is usually pretty decent because of the straight layout"},{"area_key":"2_9_town","notes":""},{"area_key":"2_9_2","notes":"Go down the supply hoists,"},{"area_key":"2_9_3","notes":"Recipe\nWaypoint\nStorm Chest (quest)\nWhen you find oasis, TP to town\n"},{"area_key":"2_9_town","notes":"Back through portal"},{"area_key":"2_9_3","notes":""},{"area_key":"2_9_4","notes":"Sand pit\nKill Shakari!\nDC/TP"},{"area_key":"2_9_3","notes":""},{"area_key":"2_9_5","notes":"Waypoint (top right)"},{"area_key":"2_9_6","notes":"Recipe\nGet the basilisk Acid\nDC/TP"},{"area_key":"2_9_5","notes":""},{"area_key":"2_9_7","notes":"Waypoint\nTRIAL\nRecipe"},{"area_key":"2_9_8","notes":"Recipe\nWaypoint\nShrine of the winds, kill Garukhan\n\nRefinery top right"},{"area_key":"2_9_9","notes":"Kill the boss to get the powder in the room beside him\nDC/TP"},{"area_key":"2_9_8","notes":"Sin"},{"area_key":"2_9_10_1","notes":""},{"area_key":"2_9_10_2","notes":"Kill the 3 bosses\nEnter black heart\nKill the depraved trinity"},{"area_key":"2_10_town","notes":""},{"area_key":"2_10_1","notes":"Close top left save the dude"},{"area_key":"2_10_2","notes":"Ur coming from west\nWaypoint, Ossuary = North west"},{"area_key":"2_10_9","notes":"Bone pits\nTRIAL!\nMaybe wanna do lab around here\nDC/TP"},{"area_key":"2_10_2","notes":"Waypoint, Ossuary = North west\nTorched Courts = North east"},{"area_key":"2_10_3","notes":""},{"area_key":"2_10_4","notes":"Recipe\nWaypoint\nKill Avarius in sanctum of Innocence\nDC/TP"},{"area_key":"2_10_2","notes":"Waypoint, Ossuary = North west\nControl Blocks = South west"},{"area_key":"2_10_7","notes":"Kill Vilenta\nDC/TP"},{"area_key":"2_10_2","notes":"Just above the waypoint go to Innocence"},{"area_key":"2_10_5","notes":""},{"area_key":"2_10_6","notes":"Recipe\nKill A10 KITAVA! >:D\nDC/TP/DONE"}],"current":0} \ No newline at end of file diff --git a/data/base_plan.json b/data/base_plan.json new file mode 100644 index 0000000..a8cb170 --- /dev/null +++ b/data/base_plan.json @@ -0,0 +1,705 @@ +{ + "plan": [ + { + "area_key": "1_1_1", + "notes": "Kill hillock" + }, + { + "area_key": "1_1_town", + "notes": "Tarkleigh reward" + }, + { + "area_key": "1_1_2", + "notes": "" + }, + { + "area_key": "1_1_3", + "notes": "3x eggs, then passage" + }, + { + "area_key": "1_1_4_1", + "notes": "WP to coast" + }, + { + "area_key": "1_1_2", + "notes": "" + }, + { + "area_key": "1_1_2a", + "notes": "Kill Hailrake then (DC/Portal)" + }, + { + "area_key": "1_1_4_1", + "notes": "" + }, + { + "area_key": "1_1_5", + "notes": "" + }, + { + "area_key": "1_1_6", + "notes": "" + }, + { + "area_key": "1_1_7_1", + "notes": "Get WP then back to submerged passage" + }, + { + "area_key": "1_1_4_1", + "notes": "" + }, + { + "area_key": "1_1_4_0", + "notes": "Kill Dweller of the Deep then DC/TP" + }, + { + "area_key": "1_1_7_1", + "notes": "TRIAL!" + }, + { + "area_key": "1_1_7_2", + "notes": "Warden's quarters -> Warden's chambers -> kill brutus" + }, + { + "area_key": "1_1_8", + "notes": "" + }, + { + "area_key": "1_1_9", + "notes": "" + }, + { + "area_key": "1_1_11_1", + "notes": "" + }, + { + "area_key": "1_1_9", + "notes": "Find the cave" + }, + { + "area_key": "1_1_9a", + "notes": "Get the allflame" + }, + { + "area_key": "1_1_9", + "notes": "Kill fairgraves, DC/TP/WP to next" + }, + { + "area_key": "1_1_11_1", + "notes": "" + }, + { + "area_key": "1_1_11_2", + "notes": "Find merveil's lair, kill merveil" + }, + { + "area_key": "1_2_1", + "notes": "" + }, + { + "area_key": "1_2_town", + "notes": "" + }, + { + "area_key": "1_2_7", + "notes": "" + }, + { + "area_key": "1_2_12", + "notes": "\nBandit Oak, kill or help (Some builds might struggle doing this one first, might just wanna grab WP and go)" + }, + { + "area_key": "1_2_7", + "notes": "" + }, + { + "area_key": "1_2_9", + "notes": "Waypoint along road\nWeaver first (look for spiderwebs along a side)" + }, + { + "area_key": "1_2_10", + "notes": "" + }, + { + "area_key": "1_2_9", + "notes": "Bandit Alira, kill or help\nKill blackguards\nDC/TP/WP" + }, + { + "area_key": "1_2_2", + "notes": "Optional: The Den, kill the white beast" + }, + { + "area_key": "1_2_3", + "notes": "" + }, + { + "area_key": "1_2_15", + "notes": "" + }, + { + "area_key": "1_2_5_1", + "notes": "\nTrial\nOptional quest in crypt level 2\nDC/TP/WP" + }, + { + "area_key": "1_2_3", + "notes": "" + }, + { + "area_key": "1_2_4", + "notes": "\nBandit Kraityn, kill or help\nDC/TP/WP" + }, + { + "area_key": "1_2_3", + "notes": "" + }, + { + "area_key": "1_2_6_1", + "notes": "" + }, + { + "area_key": "1_2_6_2", + "notes": "TRIAL!\nHelena\nDC/TP/WP" + }, + { + "area_key": "1_2_12", + "notes": "Close to " + }, + { + "area_key": "1_2_11", + "notes": "open the seal and continue" + }, + { + "area_key": "1_2_8", + "notes": "" + }, + { + "area_key": "1_2_14_2", + "notes": "Crafting recipe" + }, + { + "area_key": "1_2_14_3", + "notes": "DON'T MISS RECIPE\nKill the Vall oversoul" + }, + { + "area_key": "1_3_1", + "notes": "Clarissa on the way to town" + }, + { + "area_key": "1_3_town", + "notes": "" + }, + { + "area_key": "1_3_2", + "notes": "Remember where sewers is for when you got the keys!" + }, + { + "area_key": "1_3_3_1", + "notes": "\nTRIAL!\nPiety\nRecipe\nDC/TP/WP" + }, + { + "area_key": "1_3_1", + "notes": "Get sewer keys" + }, + { + "area_key": "1_3_2", + "notes": "Open the sewer with keys from town" + }, + { + "area_key": "1_3_10_1", + "notes": "1 bust before rest\n\nremaining 2 busts" + }, + { + "area_key": "1_3_5", + "notes": "\nOptionally get decanter spiritus for swig of hope quest" + }, + { + "area_key": "1_3_6", + "notes": "TRIAL!\nRecipe\nDC/TP/WP" + }, + { + "area_key": "1_3_5", + "notes": "" + }, + { + "area_key": "1_3_7", + "notes": "Get ribbon spool and \n(down left)\nDocks up left" + }, + { + "area_key": "1_3_9", + "notes": "Find infernal talc\nOptionally find and fairgraves for part of swig of hope quest" + }, + { + "area_key": "1_3_7", + "notes": "Solaris temple up to the right kind of compared to docks" + }, + { + "area_key": "1_3_8_1", + "notes": "" + }, + { + "area_key": "1_3_8_2", + "notes": "Dialla\nRecipe in the room on the side" + }, + { + "area_key": "1_3_10_1", + "notes": "Unblock the place close to \nRecipe\nEbony barracks" + }, + { + "area_key": "1_3_13", + "notes": "" + }, + { + "area_key": "1_3_14_1", + "notes": "" + }, + { + "area_key": "1_3_14_2", + "notes": "Piety,\nRecipe\nDC/TP/WP" + }, + { + "area_key": "1_3_13", + "notes": "gardens around east" + }, + { + "area_key": "1_3_15", + "notes": "Follow path\n\n\nLibrary top left(?) (optional quest for gem shop)\nTRIAL! bit top right compared to library (?)\n\nOptional chitus plum (quest for fairgraves done)\n\nSceptre of god (lower) (follow main path after )" + }, + { + "area_key": "1_3_18_1", + "notes": "" + }, + { + "area_key": "1_3_18_2", + "notes": "" + }, + { + "area_key": "1_4_1", + "notes": "" + }, + { + "area_key": "1_4_town", + "notes": "" + }, + { + "area_key": "1_4_2", + "notes": "Kill Voll\nRecipe\nDC/TP" + }, + { + "area_key": "1_4_3_1", + "notes": "" + }, + { + "area_key": "1_4_3_2", + "notes": "Deshret's spirit\nThen crystal veins" + }, + { + "area_key": "1_4_3_3", + "notes": "Recipe\n\n(Potentially do lab now)\nKill kaom and daresso" + }, + { + "area_key": "1_4_6_1", + "notes": "" + }, + { + "area_key": "1_4_6_2", + "notes": "Belly of the beast\nKill piety\nRecipe" + }, + { + "area_key": "1_4_6_3", + "notes": "\n\nKill the 3 guardians\n\nBlack core, kill malachai!\n\nDC/TP/WP" + }, + { + "area_key": "1_4_7", + "notes": "Recipe\nOriath portal" + }, + { + "area_key": "1_5_1", + "notes": "Kill overseer Crow\nLadder drops down nearby when you go close" + }, + { + "area_key": "1_5_town", + "notes": "Town! :D" + }, + { + "area_key": "1_5_2", + "notes": "Miasmeter down left\nkill Justicar" + }, + { + "area_key": "1_5_3", + "notes": "" + }, + { + "area_key": "1_5_4", + "notes": "" + }, + { + "area_key": "1_5_5", + "notes": "Recipe\n\nKill high templar avarius\nDC/TP/WP" + }, + { + "area_key": "1_5_4b", + "notes": "" + }, + { + "area_key": "1_5_3b", + "notes": "North east = Torched Courts (you come from here)\nNorth west = Ossuary ()" + }, + { + "area_key": "1_5_6", + "notes": "Recipe\nSign of Purity\nDC/TP/WP/Exit" + }, + { + "area_key": "1_5_3b", + "notes": "Kill Utula\nThen go to Reliquary\nEast = Utula\nSouth east = Reliquary" + }, + { + "area_key": "1_5_7", + "notes": "Recipe\nTorments in 3 '\"corners\" \nDC/TP/WP" + }, + { + "area_key": "1_5_3b", + "notes": "North west = Ossuary ()\nWest = Cathedral rooftop" + }, + { + "area_key": "1_5_8", + "notes": "Find cathedral apex\nKill Kitava!" + }, + { + "area_key": "2_6_town", + "notes": "Down left (back to strand)" + }, + { + "area_key": "2_6_1", + "notes": "Kill all monster on the strand, unique at end\nDC/TP/WP/go back" + }, + { + "area_key": "2_6_town", + "notes": "Potentially you'd want to buy a bunch of gems from" + }, + { + "area_key": "2_6_2", + "notes": "" + }, + { + "area_key": "2_6_4", + "notes": "Kill the forgotten warrior \nThen karui fortress" + }, + { + "area_key": "2_6_5", + "notes": "kill tukohama in his keep\nRecipe inside the keep!!!" + }, + { + "area_key": "2_6_6", + "notes": "" + }, + { + "area_key": "2_6_7_1", + "notes": "Recipe\n\nTRIAL!" + }, + { + "area_key": "2_6_7_2", + "notes": "Ascend the tower and kill brutus+shavronne!\nRecipe in Warden's Chambers afterwards" + }, + { + "area_key": "2_6_8", + "notes": "\nValley of the firedrinker (kill abberath)\nDC/TP/WP" + }, + { + "area_key": "2_6_9", + "notes": "Recipe\n" + }, + { + "area_key": "2_6_10", + "notes": "" + }, + { + "area_key": "2_6_11", + "notes": "Find spawning grounds and kill Puppet Mistress\nDC/TP" + }, + { + "area_key": "2_6_10", + "notes": "" + }, + { + "area_key": "2_6_12", + "notes": "" + }, + { + "area_key": "2_6_13", + "notes": "" + }, + { + "area_key": "2_6_14", + "notes": "Recipe\n" + }, + { + "area_key": "2_6_15", + "notes": "Find and kill the Brine king" + }, + { + "area_key": "2_7_1", + "notes": "" + }, + { + "area_key": "2_7_2", + "notes": "" + }, + { + "area_key": "2_7_3", + "notes": "" + }, + { + "area_key": "2_7_4", + "notes": "Recipe\n\nTRIAL!\nMaligaro's Map\nDC/TP/WP" + }, + { + "area_key": "2_7_2", + "notes": "" + }, + { + "area_key": "2_7_5_1", + "notes": "\nRecipe\nMaligaro's map for sanctum" + }, + { + "area_key": "2_7_5_map", + "notes": "Kill maligaro\nREMEMBER to take black venom from the spider" + }, + { + "area_key": "2_7_5_1", + "notes": "" + }, + { + "area_key": "2_7_5_2", + "notes": "TRIAL!\nRecipe" + }, + { + "area_key": "2_7_6", + "notes": "" + }, + { + "area_key": "2_7_7", + "notes": "\nFind and kill Greust (Fortress Encampment)" + }, + { + "area_key": "2_7_8", + "notes": "Optionally find the shrine, go to town get greust's necklace and then put it on the shrine\n(amulet reward quest)" + }, + { + "area_key": "2_7_9", + "notes": "Collect fireflies\nRecipe\nKill the Gruthkul\nDC/TP/EXIT" + }, + { + "area_key": "2_7_8", + "notes": "" + }, + { + "area_key": "2_7_10", + "notes": "\nRecipe\nKishara's Star" + }, + { + "area_key": "2_7_11", + "notes": "\nFind Yeena" + }, + { + "area_key": "2_7_12_1", + "notes": "" + }, + { + "area_key": "2_7_12_2", + "notes": "Recipe\nArakaali's web, kill arakali" + }, + { + "area_key": "2_8_1", + "notes": "" + }, + { + "area_key": "2_8_town", + "notes": "" + }, + { + "area_key": "2_8_2_1", + "notes": "" + }, + { + "area_key": "2_8_2_2", + "notes": "Recipe\nLoose Crate\nKill Doedre the vile\n\nSewer outlet leads to next + " + }, + { + "area_key": "2_8_8", + "notes": "Closer to the entry of the quay than grain gate is a long bridge to find ressurection site (Tolman)\n" + }, + { + "area_key": "2_8_9", + "notes": "Kill gemling legionnaires\nContinue from that area to find next place" + }, + { + "area_key": "2_8_10", + "notes": "Follow road for " + }, + { + "area_key": "2_8_12_1", + "notes": "" + }, + { + "area_key": "2_8_12_2", + "notes": "Kill Dawn\nRECIPE\nDC/TP\n(we're going to doedre's cesspool through )" + }, + { + "area_key": "2_8_2_2", + "notes": "" + }, + { + "area_key": "2_8_3", + "notes": "" + }, + { + "area_key": "2_8_5", + "notes": "Kill the boss to get the quest item\nTRIAL!\nRecipe" + }, + { + "area_key": "2_8_4", + "notes": "Kill yuuuuguuulll!!! :D\nDC/TP" + }, + { + "area_key": "2_8_5", + "notes": "" + }, + { + "area_key": "2_8_6", + "notes": " (up left kinda)" + }, + { + "area_key": "2_8_7_1_", + "notes": "" + }, + { + "area_key": "2_8_7_2", + "notes": "Kill Dusk!\nRECIPE!\nDC/TP" + }, + { + "area_key": "2_8_6", + "notes": "(Down right kinda)" + }, + { + "area_key": "2_8_13", + "notes": "Kill the sun and moon false gods ;D" + }, + { + "area_key": "2_9_1", + "notes": "If for whatever reason you'd want to level a bit, this place is usually pretty decent because of the straight layout" + }, + { + "area_key": "2_9_town", + "notes": "" + }, + { + "area_key": "2_9_2", + "notes": "Go down the supply hoists," + }, + { + "area_key": "2_9_3", + "notes": "Recipe\n\nStorm Chest (quest)\nWhen you find oasis, TP to town\n" + }, + { + "area_key": "2_9_town", + "notes": "Back through portal" + }, + { + "area_key": "2_9_3", + "notes": "" + }, + { + "area_key": "2_9_4", + "notes": "Sand pit\nKill Shakari!\nDC/TP" + }, + { + "area_key": "2_9_3", + "notes": "" + }, + { + "area_key": "2_9_5", + "notes": " (top right)" + }, + { + "area_key": "2_9_6", + "notes": "Recipe\nGet the basilisk Acid\nDC/TP" + }, + { + "area_key": "2_9_5", + "notes": "" + }, + { + "area_key": "2_9_7", + "notes": "\nTRIAL\nRecipe" + }, + { + "area_key": "2_9_8", + "notes": "Recipe\n\nShrine of the winds, kill Garukhan\n\nRefinery top right" + }, + { + "area_key": "2_9_9", + "notes": "Kill the boss to get the powder in the room beside him\nDC/TP" + }, + { + "area_key": "2_9_8", + "notes": "Sin" + }, + { + "area_key": "2_9_10_1", + "notes": "" + }, + { + "area_key": "2_9_10_2", + "notes": "Kill the 3 bosses\nEnter black heart\nKill the depraved trinity" + }, + { + "area_key": "2_10_town", + "notes": "" + }, + { + "area_key": "2_10_1", + "notes": "Close top left save the dude" + }, + { + "area_key": "2_10_2", + "notes": "Ur coming from west\n, Ossuary = North west" + }, + { + "area_key": "2_10_9", + "notes": "Bone pits\nTRIAL!\nMaybe wanna do lab around here\nDC/TP" + }, + { + "area_key": "2_10_2", + "notes": ", Ossuary = North west\nTorched Courts = North east" + }, + { + "area_key": "2_10_3", + "notes": "" + }, + { + "area_key": "2_10_4", + "notes": "Recipe\n\nKill Avarius in sanctum of Innocence\nDC/TP" + }, + { + "area_key": "2_10_2", + "notes": ", Ossuary = North west\nControl Blocks = South west" + }, + { + "area_key": "2_10_7", + "notes": "Kill Vilenta\nDC/TP" + }, + { + "area_key": "2_10_2", + "notes": "Just above the go to Innocence" + }, + { + "area_key": "2_10_5", + "notes": "" + }, + { + "area_key": "2_10_6", + "notes": "Recipe\nKill A10 KITAVA! >:D\nDC/TP/DONE" + } + ], + "current": 0 +} \ No newline at end of file diff --git a/src/app/app.component.html b/src/app/app.component.html index bd99f66..fc69a31 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,4 +1,4 @@ -
+
@@ -14,9 +14,9 @@
- -
+ +
\ No newline at end of file diff --git a/src/app/carousel/carousel.component.html b/src/app/carousel/carousel.component.html index 280f0e8..c5a15ab 100644 --- a/src/app/carousel/carousel.component.html +++ b/src/app/carousel/carousel.component.html @@ -11,7 +11,7 @@ [attr.data-slideIndex]="visible.index" [ngStyle]="vertical ? {'grid-row-start':visible.index + 1} : {'grid-column-start':visible.index + 1}">
- +
diff --git a/src/app/plan-display/plan-display.component.html b/src/app/plan-display/plan-display.component.html index 91b891d..4d872c4 100644 --- a/src/app/plan-display/plan-display.component.html +++ b/src/app/plan-display/plan-display.component.html @@ -1,15 +1,17 @@
-
- -
{{worldAreaMap!.get(slide.area_key)!.name}}
+ +
{{worldAreaMap!.get(slide.area_key)!.name}}
(W)
+ @@ -19,16 +21,16 @@ - +
+ [bounds]="bounds" [snappable]="true" [style.visibility]="overlayService.interactable ? 'visible' : 'hidden'"> -
@@ -37,7 +39,7 @@
- +
\ No newline at end of file diff --git a/src/app/plan-display/plan-display.component.scss b/src/app/plan-display/plan-display.component.scss index c0dfbfb..4b1f4de 100644 --- a/src/app/plan-display/plan-display.component.scss +++ b/src/app/plan-display/plan-display.component.scss @@ -15,16 +15,50 @@ user-select: none; &>* { - flex: 1 1 auto; + flex: 1 1 100px; &:first-child { - flex: 0 0 auto; - max-height: 60px; + flex: 1 1 15px; } } } -.zone-slide {} +.waypoint-text { + color: rgba(25, 255, 255, 0.5); + position: absolute; + right: 10px; +} + +.waypoint { + + /* Pre-render the bigger shadow, but hide it */ + &::after { + box-shadow: 0 0px 15px rgba(25, 255, 255, 0.5); + transition: opacity 0.3s ease-in-out; + opacity: 0; + + content: ""; + position: absolute; + top: 0; + right: 0; + left: 0; + bottom: 0; + } +} + +.active { + &::after { + opacity: 1; + } +} + +.zone-slide { + display: relative; + height: 100%; + display: flex; + align-items: center; + justify-content: center; +} .controls { position: absolute; @@ -50,6 +84,7 @@ notes { position: absolute; top: 0; right: 0; + } @@ -60,15 +95,17 @@ notes { right: 10px; background-color: none; display: flex; - align-items: center; - justify-content: center; + align-items: center; + justify-content: center; align-content: center; + font-size: 10rem; + & span { display: flex; - align-items: center; - justify-content: center; + align-items: center; + justify-content: center; width: 100%; height: 100%; } @@ -81,9 +118,9 @@ notes { } .material-symbols-outlined { - font-variation-settings: - 'FILL' 0, - 'wght' 400, - 'GRAD' 0, - 'opsz' 48 + font-variation-settings: + 'FILL' 0, + 'wght' 400, + 'GRAD' 0, + 'opsz' 48 } \ No newline at end of file diff --git a/src/app/plan-display/plan-display.component.ts b/src/app/plan-display/plan-display.component.ts index f96a0eb..0c8e5b9 100644 --- a/src/app/plan-display/plan-display.component.ts +++ b/src/app/plan-display/plan-display.component.ts @@ -42,15 +42,15 @@ export class PlanDisplayComponent implements AfterViewInit, OnInit { constructor(private events: EventsService, private configService: ConfigService, private cdr: ChangeDetectorRef, private shortcut: ShortcutService, public planService: PlanService, public worldAreaService: WorldAreaService, public overlayService: OverlayService, private zone: NgZone) { window.addEventListener("resize", this.windowInitHandler.bind(this)); - const test = this.events.listen("OverlayStateChange").subscribe(event => { - if (!this.hasAttachedOnce) { - this.hasAttachedOnce = true; - test.unsubscribe(); - if (!event.payload.Hidden) - overlayService.setInteractable(); - } + // const test = this.events.listen("OverlayStateChange").subscribe(event => { + // if (!this.hasAttachedOnce) { + // this.hasAttachedOnce = true; + // test.unsubscribe(); + // if (!event.payload.Hidden) + // overlayService.setInteractable(); + // } - }); + // }); appWindow.listen("entered", (entered) => { console.log("entered", entered); @@ -69,7 +69,6 @@ export class PlanDisplayComponent implements AfterViewInit, OnInit { windowInitHandler() { if (window.innerWidth > 0) { this.ngAfterViewInit(); - window.removeEventListener("resize", this.windowInitHandler.bind(this)); } } @@ -95,6 +94,15 @@ export class PlanDisplayComponent implements AfterViewInit, OnInit { return `${this.rect!.height}px`; } + hasWaypoint(key?: string): boolean { + if(!key) { + key = this.planService.currentPlan!.plan[this.planService.currentPlan!.current].area_key; + } + const world_area = this.worldAreaMap?.get(key); + console.log("waypoint: ", world_area!.has_waypoint); + return world_area!.has_waypoint; + } + ngAfterViewInit(): void { if (window.innerWidth > 0) { const cfgRect = this.configService.config.initialPlanWindowPosition; diff --git a/src/app/services/overlay.service.ts b/src/app/services/overlay.service.ts index 312d584..b15fcfa 100644 --- a/src/app/services/overlay.service.ts +++ b/src/app/services/overlay.service.ts @@ -19,12 +19,15 @@ export class OverlayService { interactable: boolean = false; isBinding: boolean = false; visible: boolean = false; + isOverlay: boolean; constructor(private shortcuts: ShortcutService, private events: EventsService, private configService: ConfigService) { if (appWindow.label == "Overlay") { this.shortcuts.register(this.configService.config.toggleOverlay, this.onToggleOverlay.bind(this)); this.events.listen("OverlayStateChange").subscribe(this.onOverlayStateChange.bind(this)); } + this.isOverlay = appWindow.label === "Overlay"; + } onOverlayStateChange(event: Event) { diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html index e6b71fb..6377ace 100644 --- a/src/app/settings/settings.component.html +++ b/src/app/settings/settings.component.html @@ -6,7 +6,7 @@ backdrop color
- Auto hide on unfocus + Auto hide on unfocus
diff --git a/src/app/settings/settings.component.scss b/src/app/settings/settings.component.scss index 29bdce3..37f87b6 100644 --- a/src/app/settings/settings.component.scss +++ b/src/app/settings/settings.component.scss @@ -6,4 +6,8 @@ .checkboxes { display: grid; grid-template-columns: 1fr 10fr; +} + +mat-slide-toggle { + color: green; } \ No newline at end of file diff --git a/src/app/settings/settings.component.ts b/src/app/settings/settings.component.ts index a8aa526..10cced4 100644 --- a/src/app/settings/settings.component.ts +++ b/src/app/settings/settings.component.ts @@ -28,7 +28,7 @@ export class SettingsComponent { constructor( public configService: ConfigService, private zone: NgZone, - private overlayService: OverlayService, + public overlayService: OverlayService, private planService: PlanService, public dialog: MatDialog, private shortcut: ShortcutService diff --git a/src/assets/material-settings.svg b/src/assets/material-settings.svg index a292720..bc0c2e7 100644 --- a/src/assets/material-settings.svg +++ b/src/assets/material-settings.svg @@ -1 +1,5 @@ - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/src/styles.scss b/src/styles.scss index 90fe8e0..18ad4db 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -43,5 +43,9 @@ div.picker_wrapper.popup { flex-grow: 1; } + +.mat-primary-on-dark { + --mdc-theme-text-primary-on-background: white; +} // Emit theme-dependent styles for common features used across multiple components. @include mat.all-component-themes($my-theme); \ No newline at end of file