Sausage Goblin/Save a Free Banish

Ignose · Dec 12, 2023 · c43ec8b · c43ec8b
1 parent 52b567c
commit c43ec8b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/src/combat.ts b/src/combat.ts
@@ -1,5 +1,5 @@
 import { mpCost, myPrimestat, toInt } from "kolmafia";
-import { $item, $skill, $stat, get, have, StrictMacro } from "libram";
+import { $item, $monster, $skill, $stat, get, have, StrictMacro } from "libram";
 
 //export const mainStat = myClass().primestat;
 export const mainStat = myPrimestat(); //Update to select mainstat based on class derived from Libram
@@ -48,13 +48,24 @@ export default class Macro extends StrictMacro {
   }
 
   itemDrop(): Macro {
-    return Macro.trySkill($skill`Bowl Straight Up`)
-      .trySkill($skill`Become a Bat`)
-      .trySkill($skill`Feel Hatred`)
-      .trySkill($skill`Reflex Hammer`)
-      .trySkill($skill`Throw Latte on Opponent`)
-      .trySkill($skill`KGB tranquilizer dart`)
-      .trySkill($skill`Snokebomb`);
+    return (
+      Macro.if_(
+        $monster`sausage goblin`,
+        Macro.trySkill($skill`Bowl Straight Up`)
+          .trySkill($skill`Become a Bat`)
+          .default(false)
+      ),
+      Macro.if_(
+        $monster`fluffy bunny`,
+        Macro.trySkill($skill`Bowl Straight Up`)
+          .trySkill($skill`Become a Bat`)
+          .trySkill($skill`Feel Hatred`)
+          .trySkill($skill`Reflex Hammer`)
+          .trySkill($skill`Throw Latte on Opponent`)
+          .trySkill($skill`KGB tranquilizer dart`)
+          .trySkill($skill`Snokebomb`)
+      )
+    );
   }
 
   static itemDrop(): Macro {

diff --git a/src/tasks/boozedrop.ts b/src/tasks/boozedrop.ts
@@ -32,6 +32,7 @@ import {
   $slot,
   CommunityService,
   get,
+  getKramcoWandererChance,
   have,
   uneffect,
   withChoice,
@@ -131,7 +132,10 @@ export const BoozeDropQuest: Quest = {
       combat: new CombatStrategy().macro(Macro.itemDrop().abort()),
       outfit: {
         back: $item`vampyric cloake`,
-        offhand: $item`latte lovers member's mug`,
+        offhand:
+          getKramcoWandererChance() >= 1.0
+            ? $item`Kramco Sausage-o-Matic™`
+            : $item`latte lovers member's mug`,
         acc1: $item`Kremlin's Greatest Briefcase`,
         acc2: $item`Lil' Doctor™ bag`,
         familiar: chooseFamiliar(false),