diff --git a/src/questInfo/delay.ts b/src/questInfo/delay.ts index 84ef1284..59dbd2ae 100644 --- a/src/questInfo/delay.ts +++ b/src/questInfo/delay.ts @@ -31,7 +31,7 @@ export const DELAY_ZONES: ZoneDelay[] = [ }, { zone: $location`The Penultimate Fantasy Airship`, - length: haveUnrestricted($item`bat wings`) ? 20 : 25, + length: () => (haveUnrestricted($item`bat wings`) ? 20 : 25), }, { zone: $location`The Hidden Park`, @@ -64,8 +64,7 @@ export const DELAY_ZONES: ZoneDelay[] = [ }, { zone: $location`The Copperhead Club`, - // Not including NCs themselves here. - length: 12, + length: 14, }, ]; diff --git a/src/sections/quests/Level13.tsx b/src/sections/quests/Level13.tsx index 4ac3ca88..d6be507f 100644 --- a/src/sections/quests/Level13.tsx +++ b/src/sections/quests/Level13.tsx @@ -12,19 +12,13 @@ import AdviceTooltip from "../../components/AdviceTooltip"; import Line from "../../components/Line"; import Tile from "../../components/Tile"; import { haveUnrestricted } from "../../util/available"; -import { Step } from "../../util/quest"; +import { inRun, Step } from "../../util/quest"; const Level13: FC = () => { const step = questStep("questL13Final"); - const inAftercore = get("kingLiberated"); - const inGreyGoo = myPath() === $path`Grey Goo`; const inActuallyEdTheUndying = myPath() === $path`Actually Ed the Undying`; - if ( - inAftercore || - inGreyGoo || - (step === Step.UNSTARTED && inActuallyEdTheUndying) - ) { + if (!inRun() || (step === Step.UNSTARTED && inActuallyEdTheUndying)) { return null; } @@ -53,6 +47,7 @@ const Level13: FC = () => { Complete the races at the registration desk. @@ -71,6 +66,7 @@ const Level13: FC = () => { Navigate the Hedge Maze in the Naughty Sorceress' Tower. @@ -86,11 +82,15 @@ const Level13: FC = () => { "Boris's key", "Jarlsberg's key", "Sneaky Pete's key", + "skeleton key", + "Richard's star key", + "digital key", ].filter((key) => !keysUsed.includes(key)); return ( Open the tower door. @@ -106,6 +106,7 @@ const Level13: FC = () => { Defeat the Wall of Skin. @@ -125,6 +126,7 @@ const Level13: FC = () => { Defeat the Wall of Meat. @@ -138,23 +140,28 @@ const Level13: FC = () => { ); } - const candyCaneSwordCane = $item`candy cane sword cane`; - const haveCcsc = haveUnrestricted(candyCaneSwordCane); - const haveCcscEquipped = haveEquipped(candyCaneSwordCane); + if (!pastTowerLevel3) { + const candyCaneSwordCane = $item`candy cane sword cane`; + const haveCcsc = haveUnrestricted(candyCaneSwordCane); + const haveCcscEquipped = haveEquipped(candyCaneSwordCane); - const haveSaucegeyser = have($skill`Saucegeyser`); - const mlModifier = Math.max(0.5, 1 - numericModifier("Monster Level") / 250); - const saucegeyserDamage = - mlModifier * - ((numericModifier("Spell Damage Percent") / 100) * - (60 + 0.4 * myBuffedstat($stat`Mysticality`)) + - numericModifier("Spell Damage")); + const haveSaucegeyser = have($skill`Saucegeyser`); + const mlModifier = Math.max( + 0.5, + 1 - numericModifier("Monster Level") / 250, + ); + const saucegeyserDamage = + 3 * + mlModifier * + ((numericModifier("Spell Damage Percent") / 100) * + (60 + 0.4 * myBuffedstat($stat`Mysticality`)) + + numericModifier("Spell Damage")); - if (!pastTowerLevel3) { return ( {have($item`electric boning knife`) ? ( @@ -194,6 +201,7 @@ const Level13: FC = () => { Face the looking glass. @@ -214,6 +222,7 @@ const Level13: FC = () => { Fight your shadow. @@ -232,6 +241,7 @@ const Level13: FC = () => { Defeat the Naughty Sorceress.