tweaks.

loathers · Nov 17, 2024 · d8498d1 · d8498d1
1 parent 1d8ad87
commit d8498d1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/src/components/FamiliarButtons.tsx b/src/components/FamiliarButtons.tsx
@@ -20,7 +20,7 @@ const FamiliarButtons: FC<FamiliarButtonsProps> = ({
 
   return (
     <AsyncButton
-      href={`/familiar.ph?&action=newfam&newfam=${linkID}&pwd=${myHash()}`}
+      href={`/familiar.php?&action=newfam&newfam=${linkID}&pwd=${myHash()}`}
       {...props}
     >
       take

diff --git 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
@@ -1,4 +1,5 @@
 import {
+  availableAmount,
   combatRateModifier,
   haveEquipped,
   myFamiliar,
@@ -118,11 +119,24 @@ const BlackForest: FC = () => {
         [
           Step.STARTED,
           <>
-            {!haveGaloshes && (
-              <Line>
-                Bring 3 blackberries to the cobbler for blackberry galoshes.
-              </Line>
+            {turnsUntilNC > 0 && combatRate < 5 && (
+              <Line color="red.500">Run +5% combat to avoid NC.</Line>
             )}
+            {!haveGaloshes &&
+              (have($item`blackberry`, 3) ? (
+                <Line>
+                  Bring 3 blackberries to the cobbler for blackberry galoshes.
+                </Line>
+              ) : (
+                <Line>
+                  Get{" "}
+                  {plural(
+                    3 - availableAmount($item`blackberry`),
+                    $item`blackberry`,
+                  )}{" "}
+                  from blackberry bush.
+                </Line>
+              ))}
             <Line>Black Forest exploration: ~{forestProgress * 20}%.</Line>
             <Line>
               Noncombat guaranteed{" "}