diff --git a/src/components/FamiliarButtons.tsx b/src/components/FamiliarButtons.tsx index e53945d9..7050462c 100644 --- a/src/components/FamiliarButtons.tsx +++ b/src/components/FamiliarButtons.tsx @@ -20,7 +20,7 @@ const FamiliarButtons: FC = ({ return ( take diff --git a/src/sections/misc/Leveling.tsx b/src/sections/misc/Leveling.tsx index 1396bfc9..fc563688 100644 --- a/src/sections/misc/Leveling.tsx +++ b/src/sections/misc/Leveling.tsx @@ -41,7 +41,7 @@ import MainLink from "../../components/MainLink"; import Tile from "../../components/Tile"; import { haveUnrestricted } from "../../util/available"; import { inventoryLink } from "../../util/links"; -import { questStarted } from "../../util/quest"; +import { questStarted, Step } from "../../util/quest"; import { renderSourceList, Source } from "../../util/source"; import { plural } from "../../util/text"; @@ -151,7 +151,7 @@ const Leveling: React.FC = () => { name: "Enchanted Bean", remaining: () => +( - questStep("questL10Garbage") <= 1 && + questStep("questL10Garbage") <= Step.STARTED && haveUnrestricted($item`spring shoes`) ), render: () => { diff --git a/src/sections/quests/level11/BlackForest.tsx b/src/sections/quests/level11/BlackForest.tsx index 2648ad03..7104c76f 100644 --- a/src/sections/quests/level11/BlackForest.tsx +++ b/src/sections/quests/level11/BlackForest.tsx @@ -1,4 +1,5 @@ import { + availableAmount, combatRateModifier, haveEquipped, myFamiliar, @@ -118,11 +119,24 @@ const BlackForest: FC = () => { [ Step.STARTED, <> - {!haveGaloshes && ( - - Bring 3 blackberries to the cobbler for blackberry galoshes. - + {turnsUntilNC > 0 && combatRate < 5 && ( + Run +5% combat to avoid NC. )} + {!haveGaloshes && + (have($item`blackberry`, 3) ? ( + + Bring 3 blackberries to the cobbler for blackberry galoshes. + + ) : ( + + Get{" "} + {plural( + 3 - availableAmount($item`blackberry`), + $item`blackberry`, + )}{" "} + from blackberry bush. + + ))} Black Forest exploration: ~{forestProgress * 20}%. Noncombat guaranteed{" "}