diff --git a/client/src/prefs/preferences.json b/client/src/prefs/preferences.json index 4baa8739..f20e6775 100644 --- a/client/src/prefs/preferences.json +++ b/client/src/prefs/preferences.json @@ -59,6 +59,7 @@ "questL11Curses", "questL11Desert", "questL11MacGuffin", + "questL11Palindome", "questL11Ron", "questL11Shen", "questL11Worship", diff --git a/client/src/sections/quests/Level11.tsx b/client/src/sections/quests/Level11.tsx index f8d26f86..59350b6f 100644 --- a/client/src/sections/quests/Level11.tsx +++ b/client/src/sections/quests/Level11.tsx @@ -2,6 +2,7 @@ import { questFinished } from "../../util/quest"; import BlackForest from "./level11/BlackForest"; import Copperhead from "./level11/Copperhead"; import HiddenCity from "./level11/HiddenCity"; +import Palindome from "./level11/Palindome"; import Zeppelin from "./level11/Zeppelin"; const Level11 = () => { @@ -15,6 +16,7 @@ const Level11 = () => { + ); }; diff --git a/client/src/sections/quests/level11/Palindome.tsx b/client/src/sections/quests/level11/Palindome.tsx index 9df534c1..c18f4330 100644 --- a/client/src/sections/quests/level11/Palindome.tsx +++ b/client/src/sections/quests/level11/Palindome.tsx @@ -11,8 +11,6 @@ import { commaAnd, plural, pluralize } from "../../../util/text"; const PALINDOME_URL = "/place.php?whichplace=palindome"; const WHITEYS_GROVE_URL = "/place.php?whichplace=woods"; -// const HAUNTED_BEDROOM_URL = -// "/place.php?whichplace=hauntedhouse&action=hh_bedroom"; const Level11Palindome: React.FC = () => { const step = questStep("questL11Palindome"); @@ -21,24 +19,24 @@ const Level11Palindome: React.FC = () => { const canStart = have(talisman) || (have($item`Copperhead Charm`) && have($item`Copperhead Charm (rampant)`)); - const talismanEquipped = have($item`Talisman o' Namsilat`); + const talismanEquipped = haveEquipped($item`Talisman o' Namsilat`); - const neededNcPhotos = ["red nugget", "ostrich egg", "god"].filter( - (item) => !have($item`photograph of a ${item}`) + const neededNcPhotos = ["a red nugget", "an ostrich egg", "god"].filter( + (item) => !have($item`photograph of ${item}`) ); const needInstantCamera = !have($item`photograph of a dog`) && !have($item`disposable instant camera`) && - step < 3 && + step <= Step.STARTED && !have($item`"2 Love Me, Vol. 2"`); const drAwkwardOfficeUnlocked = - step > 2 || get("palindomeDudesDefeated", 0) >= 5; + step > Step.STARTED || get("palindomeDudesDefeated", 0) >= 5; return ( @@ -78,8 +76,8 @@ const Level11Palindome: React.FC = () => { Find {pluralize(neededNcPhotos.length, "photograph")} of a{" "} {commaAnd( - ["red nugget", "ostrich egg", "god"].filter( - (item) => !have($item`photograph of a ${item}`) + ["a red nugget", "an ostrich egg", "god"].filter( + (item) => !have($item`photograph of ${item}`) ) )}{" "} from non-combats. @@ -88,12 +86,8 @@ const Level11Palindome: React.FC = () => { {!drAwkwardOfficeUnlocked && ( Defeat{" "} - {plural( - 5 - get("palindomeDudesDefeated", 0), - "more dude", - "more dudes" - )}{" "} - in the palindome. + {plural(5 - get("palindomeDudesDefeated", 0), "more dude")} in + the palindome. )} , @@ -111,10 +105,13 @@ const Level11Palindome: React.FC = () => { ], [ 2, + + Use 2 Love Me, Vol. 2, then talk to Mr. Alarm in his office. + , + ], + [ + 3, <> - - Use 2 Love Me, Vol. 2, then talk to Mr. Alarm in his office. - Acquire and make wet stunt nut stew: @@ -147,32 +144,9 @@ const Level11Palindome: React.FC = () => { ], [ 4, - !have($item`wet stunt nut stew`) ? ( - <> - - Acquire and make wet stunt nut stew: - - {!have($item`stunt nuts`) && ( - - Acquire stunt nuts from Bob Racecar or Racecar Bob in - Palindome. (30% drop) - - )} - {!have($item`wet stew`) && ( - - Adventure in Whitey's Grove to acquire bird rib and lion oil. - {numericModifier("Food Drop") < 300 && ( - <> Need +{300 - numericModifier("Food Drop")}% food drop. - )} - - )} - Cook wet stunt nut stew. - - ) : ( - - Talk to Mr. Alarm with the wet stunt nut stew. - - ), + + Talk to Mr. Alarm with the wet stunt nut stew. + , ], [ 5,