Skip to content

Commit

Permalink
Tweaks.
Browse files Browse the repository at this point in the history
  • Loading branch information
phulin committed Nov 17, 2024
1 parent b7311d1 commit 47dfd25
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 6 deletions.
18 changes: 16 additions & 2 deletions src/sections/Timeline.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ import {
Text,
Tooltip,
} from "@chakra-ui/react";
import { getWorkshed, haveEffect, totalTurnsPlayed } from "kolmafia";
import {
getWorkshed,
haveEffect,
haveEquipped,
totalTurnsPlayed,
} from "kolmafia";
import {
$effect,
$item,
Expand Down Expand Up @@ -172,12 +177,21 @@ const Timeline: FC<StackProps> = (props) => {
if (AutumnAton.have()) {
elements.push({
name: "AA",
turns: AutumnAton.turnsLeft(),
turns: AutumnAton.turnsLeft() + 1,
color: "orange.600",
label: (turns) => `${plural(turns, "turn")} until autumn-aton returns.`,
});
}

if (haveEquipped($item`cursed magnifying glass`)) {
elements.push({
name: "CMG",
turns: 13 - get("cursedMagnifyingGlassCount"),
color: "gray.600",
label: (turns) => `${plural(turns, "combat")} until next void wanderer.`,
});
}

const elementsFiltered = elements.filter(({ turns }) => turns > 0);
elementsFiltered.sort(
({ turns: turnsA }, { turns: turnsB }) => turnsA - turnsB,
Expand Down
3 changes: 1 addition & 2 deletions src/sections/quests/Level10.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,8 @@ const Level10: FC = () => {
Step.STARTED,
<Line>Plant an enchanted bean in the nearby plains.</Line>,
],
[1, <Line>Visit the airship.</Line>],
[
2,
1,
<>
{delayRemaining > 0 && (
<Line>You need to burn {delayRemaining} more total delay.</Line>
Expand Down
2 changes: 1 addition & 1 deletion src/sections/quests/Level7.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ const Level7: FC = () => {
{getZoneDisplay("Nook", nookEvil, "+item drop, banish", [
`${Math.min(100, (1 + itemDropModifier() / 100) * 20).toFixed(
0,
)}% chance of evil eyes`,
)}% chance of evil eyes.`,
])}
{getZoneDisplay("Niche", nicheEvil, "sniff dirty old lihc, banish", [
"banish all but dirty old lihc",
Expand Down
13 changes: 12 additions & 1 deletion src/sections/resources/2023/CandyCaneSwordCane.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { $item, $location, $locations, get, have, questStep } from "libram";

import AdviceTooltip from "../../../components/AdviceTooltip";
import Line from "../../../components/Line";
import MainLink from "../../../components/MainLink";
import Tile from "../../../components/Tile";
import { NagPriority } from "../../../contexts/NagContext";
import useNag from "../../../hooks/useNag";
Expand All @@ -30,7 +31,17 @@ const CandyCaneSwordCane = () => {
{
available: !get("_candyCaneSwordLyle"),
node: (
<ListItem key="lyle">Bonus: Lyle's Monorail Buff (+40% init).</ListItem>
<ListItem key="lyle">
<MainLink
href={
ccscEquipped
? "/place.php?whichplace=monorail&action=monorail_lyle"
: undefined
}
>
Bonus: Lyle's Monorail Buff (+40% init).
</MainLink>
</ListItem>
),
location: null,
},
Expand Down

0 comments on commit 47dfd25

Please sign in to comment.