Preliminary Candy Cane support

Ignose · Nov 30, 2023 · ddb97bb · ddb97bb
1 parent 8be95e9
commit ddb97bb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/src/combat.ts b/src/combat.ts
@@ -11,6 +11,10 @@ export default class Macro extends StrictMacro {
     const macroHead = this.trySkill($skill`Curse of Weaksauce`)
       .trySkill($skill`Micrometeorite`)
       .trySkill($skill`Sing Along`)
+      // eslint-disable-next-line libram/verify-constants
+      .trySkill($skill`Surprisingly Sweet Stab`)
+      // eslint-disable-next-line libram/verify-constants
+      .trySkill($skill`Surprisingly Sweet Slash`)
       .if_(
         `!mpbelow ${mpCost($skill`Stuffed Mortar Shell`)}`,
         Macro.trySkill($skill`Stuffed Mortar Shell`)

diff --git a/src/engine/outfit.ts b/src/engine/outfit.ts
@@ -142,7 +142,13 @@ export function baseOutfit(allowAttackingFamiliars = true): OutfitSpec {
   const lovTunnelCompleted = get("_loveTunnelUsed") || !get("loveTunnelAvailable");
 
   return {
-    weapon: have($item`June cleaver`) ? $item`June cleaver` : undefined,
+    // eslint-disable-next-line libram/verify-constants
+    weapon: have($item`candy cane sword cane`)
+      ? // eslint-disable-next-line libram/verify-constants
+        $item`candy can sword cane`
+      : have($item`June cleaver`)
+      ? $item`June cleaver`
+      : undefined,
     hat: avoidDaylightShavingsHelm() ? undefined : $item`Daylight Shavings Helmet`,
     offhand: $item`unbreakable umbrella`,
     back: lovTunnelCompleted ? $item`LOV Epaulettes` : undefined,

diff --git a/src/tasks/earlyleveling.ts b/src/tasks/earlyleveling.ts
@@ -186,7 +186,7 @@ export const earlyLevelingQuest: Quest = {
         setConfiguration(newStations as Cycle);
         cliExecute("set _folgerInitialConfig = true");
       },
-      limit: { tries: 1 },
+      limit: { tries: 2 },
     },
     {
       name: "Red Skeleton, Tropical Skeleton, Two For One",
@@ -295,7 +295,7 @@ export const earlyLevelingQuest: Quest = {
         setConfiguration(newStations as Cycle);
         cliExecute("set _folgerSecondConfig = true");
       },
-      limit: { tries: 1 },
+      limit: { tries: 2 },
     },
     {
       name: "Kramco",
@@ -374,6 +374,7 @@ export const earlyLevelingQuest: Quest = {
       completed: () =>
         have($effect`Citizen of a Zone`) ||
         !have($familiar`Patriotic Eagle`) ||
+        get("_citizenZone") === "Madness Bakery" ||
         get("_pledgeCheck", false),
       do: $location`Madness Bakery`,
       combat: new CombatStrategy().macro(

diff --git a/src/tasks/leveling.ts b/src/tasks/leveling.ts
@@ -407,12 +407,15 @@ export const LevelingQuest: Quest = {
     },
     {
       name: "Wardrobe-o-matic",
+      // eslint-disable-next-line libram/verify-constants
       ready: () => myLevel() >= 15 && have($item`wardrobe-o-matic`),
-      completed: () => have($item`futuristic shirt`) || args.wardrobe,
+      completed: () => get("_wardrobeUsed", false),
       do: (): void => {
+        // eslint-disable-next-line libram/verify-constants
         use($item`wardrobe-o-matic`);
+        cliExecute("set _wardrobeUsed = true");
       },
-      limit: { tries: 3 },
+      limit: { tries: 1 },
     },
     {
       name: "Crimbo Candy",
@@ -1113,6 +1116,7 @@ export const LevelingQuest: Quest = {
       completed: () =>
         have($effect`Citizen of a Zone`) ||
         !have($familiar`Patriotic Eagle`) ||
+        get("_citizenZone") === "Madness Bakery" ||
         ((get("_shatteringPunchUsed") >= 3 || !have($skill`Shattering Punch`)) &&
           (get("_gingerbreadMobHitUsed") || !have($skill`Gingerbread Mob Hit`))),
       do: $location`Madness Bakery`,