Appreciate Stacy for testing!

Ignose · Aug 20, 2024 · f10f4d7 · f10f4d7
1 parent 2a673de
commit f10f4d7
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/src/engine/engine.ts b/src/engine/engine.ts
@@ -13,6 +13,7 @@ import {
   uneffect,
 } from "libram";
 import {
+  equippedAmount,
   Item,
   itemAmount,
   myFullness,
@@ -230,6 +231,24 @@ export class Engine extends BaseEngine {
     if (task.combat !== undefined && myHp() < myMaxhp() * 0.9) useSkill($skill`Cannelloni Cocoon`);
   }
 
+  setChoices(task: Task, manager: PropertiesManager): void {
+    super.setChoices(task, manager);
+    if (equippedAmount($item`June cleaver`) > 0) {
+      this.propertyManager.setChoices({
+        // June cleaver noncombats
+        1467: 3, // +adv
+        1468: get("_juneCleaverSkips", 0) < 5 ? 4 : 1,
+        1469: !have($effect`yapping pal`) ? 1 : get("_juneCleaverSkips", 0) < 5 ? 4 : 1,
+        1470: 2, // teacher's pen
+        1471: get("_juneCleaverSkips", 0) < 5 ? 4 : 1,
+        1472: !have($item`trampled ticket stub`) ? 1 : get("_juneCleaverSkips", 0) < 5 ? 4 : 2,
+        1473: get("_juneCleaverSkips", 0) < 5 ? 4 : 2,
+        1474: get("_juneCleaverSkips", 0) < 5 ? 4 : 2,
+        1475: get("_juneCleaverSkips", 0) < 5 ? 4 : 1,
+      });
+    }
+  }
+
   initPropertiesManager(manager: PropertiesManager): void {
     super.initPropertiesManager(manager);
     const bannedAutoRestorers = [

diff --git a/src/tasks/leveling.ts b/src/tasks/leveling.ts
@@ -1637,7 +1637,7 @@ export const LevelingQuest: Quest = {
         ...baseOutfit(),
         familiar: $familiar`Melodramedary`,
       }),
-      limit: { tries: 1 },
+      limit: { tries: 2 },
       post: (): void => {
         sendAutumnaton();
         sellMiscellaneousItems();

diff --git a/src/tasks/noncombat.ts b/src/tasks/noncombat.ts
@@ -79,7 +79,8 @@ export const NoncombatQuest: Quest = {
     },
     {
       name: "Cincho: Party Soundtrack",
-      completed: () => have($effect`Party Soundtrack`) || !have($skill`Cincho: Party Soundtrack`),
+      completed: () =>
+        have($effect`Party Soundtrack`) || !have($item`Cincho de Mayo`) || get("_cinchUsed") >= 40,
       do: (): void => {
         equip($slot`acc3`, $item`Cincho de Mayo`);
         useSkill($skill`Cincho: Party Soundtrack`);