Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix borg getting rid of junk - don't destroy current fuel

Drop things from quiver once squelched, so they are removed

Signed-off-by: Peter Denison <angband@marshadder.org>
  • Loading branch information...
commit 183e0c5ba386cd0e9c7dc468f1d2da5471961b59 1 parent 124db54
@pnd10 pnd10 authored
Showing with 13 additions and 0 deletions.
  1. +13 −0 src/borg/borg7.c
View
13 src/borg/borg7.c
@@ -2573,6 +2573,12 @@ bool borg_crush_slow(void)
if (item->tval == TV_ROD && (item->sval == SV_ROD_LIGHT &&
borg_skill[BI_CURLITE] <= 0)) continue;
+ /* Don't crush it if it's current fuel */
+ if (item->tval == TV_FLASK &&
+ borg_items[INVEN_LIGHT].sval == SV_LIGHT_LANTERN) continue;
+ if (item->sval == SV_LIGHT_TORCH &&
+ borg_items[INVEN_LIGHT].sval == SV_LIGHT_TORCH) continue;
+
/* Rods of healing are too hard to come by */
if (item->tval == TV_ROD && item->sval == SV_ROD_HEALING) continue;
@@ -2653,6 +2659,13 @@ bool borg_crush_slow(void)
/* This item only */
borg_keypress('a');
+
+ /* once squelched, equipped items need to be taken off */
+ if (b_i >= QUIVER_START)
+ {
+ borg_keypress('t');
+ borg_keypress(b_i+73);
+ }
}
/* Hack -- no need */
Please sign in to comment.
Something went wrong with that request. Please try again.