Allowing all staffs to re-apply but some do not use last target

flend · Apr 25, 2020 · 4cad4a2 · 4cad4a2
1 parent 0582913
commit 4cad4a2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/brogue/IO.c b/src/brogue/IO.c
@@ -3690,7 +3690,7 @@ void printHelpScreen() {
         "hjklyubn, arrow keys, or numpad  ****move or attack (control or shift to run)",
         "",
         " a/e/r/t/d/c/R  ****apply/equip/remove/throw/drop/call/relabel an item",
-        "          T, A  ****re-throw / re-apply last item at last monster",
+        "          T/A  ****re-throw last item / re-apply last staff at last monster",
         "i, right-click  ****view inventory",
         "             D  ****list discovered items",
         "",

diff --git a/src/brogue/Items.c b/src/brogue/Items.c
@@ -5963,6 +5963,16 @@ boolean playerCancelsBlinking(const short originLoc[2], const short targetLoc[2]
 }
 
 boolean staffOrWandSupportsAutoApply(item *theItem) {
+    switch (theItem->category) {
+        case WAND:
+            return false;
+        case STAFF:
+            return true;
+    }
+    return true;
+}
+
+boolean staffOrWandSupportsAutoApplyingOnLastTarget(item *theItem) {
     switch (theItem->category) {
         case WAND:
             return false;
@@ -6045,7 +6055,7 @@ boolean useStaffOrWand(item *theItem, boolean autoApply, boolean *commandsRecord
     originLoc[0] = player.xLoc;
     originLoc[1] = player.yLoc;
 
-    if (autoApply && staffOrWandSupportsAutoApply(theItem) && creatureIsTargetable(rogue.lastTarget)) {
+    if (autoApply && staffOrWandSupportsAutoApplyingOnLastTarget(theItem) && creatureIsTargetable(rogue.lastTarget)) {
         confirmedTarget = true;
         zapTarget[0] = rogue.lastTarget->xLoc;
         zapTarget[1] = rogue.lastTarget->yLoc;