Several small enhancements, better automated pull logic

Ignose · May 7, 2024 · d361252 · d361252
1 parent 3b03d86
commit d361252
Show file tree

Hide file tree

Showing 6 changed files with 821 additions and 797 deletions.
diff --git a/src/lib.ts b/src/lib.ts
@@ -516,7 +516,7 @@ export function computeBoozeDrop(): number {
 const famJacksValue = () =>
   have($familiar`Comma Chameleon`) && !have($skill`Summon Clip Art`) ? 21 : 0;
 const greatWolfs = () => Math.min(2, computeWeaponDamage(false) - 1) + 2;
-const stickKnife =
+const stickKnife = () =>
   myPrimestat() === $stat`muscle` ? Math.min(5, computeWeaponDamage(false) - 1) + 4 : 0;
 const staff = () => (have($skill`Spirit of Rigatoni`) ? 4 : 0);
 const tobikoSoda = () => (have($skill`Summon Alice's Army Cards`) ? 0 : 3);
@@ -536,7 +536,7 @@ export const pullValue: valuePull[] = [
   },
   {
     item: $item`Stick-Knife of Loathing`,
-    value: stickKnife,
+    value: stickKnife(),
   },
   {
     item: $item`Staff of Simmering Hatred`,

diff --git a/src/tasks/earlyleveling.ts b/src/tasks/earlyleveling.ts
@@ -179,23 +179,15 @@ export const earlyLevelingQuest: Quest = {
         !CombatLoversLocket.availableLocketMonsters().includes($monster`red skeleton`) ||
         args.redskeleton,
       do: () => CombatLoversLocket.reminisce($monster`red skeleton`),
-      combat: get("_daycareGymScavenges")
-        ? new CombatStrategy().macro(
-            Macro.trySkill($skill`Spring Away`)
-              .trySkill($skill`Snokebomb`)
-              .trySkill($skill`Reflex Hammer`)
-              .trySkill($skill`Chest X-Ray`)
-              .trySkill($skill`Gingerbread Mob Hit`)
-              .trySkill($skill`Shattering Punch`)
-              .default()
-          )
-        : new CombatStrategy().macro(
-            Macro.trySkill($skill`Reflex Hammer`)
-              .trySkill($skill`Chest X-Ray`)
-              .trySkill($skill`Gingerbread Mob Hit`)
-              .trySkill($skill`Shattering Punch`)
-              .default()
-          ),
+      combat: new CombatStrategy().macro(
+        Macro.trySkill($skill`Spring Away`)
+          .trySkill($skill`Snokebomb`)
+          .trySkill($skill`Reflex Hammer`)
+          .trySkill($skill`Chest X-Ray`)
+          .trySkill($skill`Gingerbread Mob Hit`)
+          .trySkill($skill`Shattering Punch`)
+          .default()
+      ),
       outfit: () => ({
         ...baseOutfit(false),
         shirt: have($item`Jurassic Parka`) ? $item`Jurassic Parka` : undefined,

diff --git a/src/tasks/leveling.ts b/src/tasks/leveling.ts
@@ -495,11 +495,13 @@ export const LevelingQuest: Quest = {
       ready: () => args.dopullstest,
       completed: () => 5 - get("_roninStoragePulls").split(",").length <= args.savepulls,
       do: (): void => {
-        const maxPullItem = findMaxPull();
-        if (maxPullItem) takeStorage(maxPullItem, 1);
-        else print("Hmmm, seems like we don't have anything to pull.");
+        while (5 - get("_roninStoragePulls").split(",").length <= args.savepulls) {
+          const maxPullItem = findMaxPull();
+          if (maxPullItem) takeStorage(maxPullItem, 1);
+          else print("Hmmm, seems like we don't have anything to pull.");
+        }
       },
-      limit: { tries: 3 },
+      limit: { tries: 4 },
     },
     {
       name: "Pull Some Jacks",

diff --git a/src/tasks/runstart.ts b/src/tasks/runstart.ts
@@ -336,7 +336,9 @@ export const RunStartQuest: Quest = {
         const statString = statToMaximizerString(myPrimestat());
         cliExecute(`mummery ${statString}`);
       },
-      outfit: { familiar: chooseFamiliar() },
+      outfit: {
+        familiar: have($familiar`Melodramedary`) ? $familiar`Melodramedary` : chooseFamiliar(),
+      },
       limit: { tries: 1 },
     },
     {

diff --git a/src/tasks/weapondamage.ts b/src/tasks/weapondamage.ts
@@ -65,6 +65,7 @@ export const WeaponDamageQuest: Quest = {
   tasks: [
     {
       name: "Potion of Potency",
+      ready: () => have($item`orange`) && have($item`scrumptious reagent`),
       completed: () =>
         have($item`potion of potency`) ||
         have($effect`Pronounced Potency`) ||