nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

another uhandedness bit

Browse Source 
For the accessories section of '*' and perminv_mode=InUse, show the
ring on main hand first (after amulet) and the one on off hand after
(before blindfold).  Main hand ring is more significant due to the
potential of a one-handed weapon becoming cursed, preventing it from
being removed.
This commit is contained in:
PatR
2023-12-04 00:54:42 -08:00
parent 6e785f4d8c
commit 2713853f28
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/fixes3-7-0.txt
View File

@@ -2375,7 +2375,8 @@ allow #dip potions into a sink to get a hint about what they are, similar to
when restoring, show current level's player-applied annotation if there is one
have farlook of a grave report the engraving on the headstone if it's known
the '*' command (list inventory items in use) now shows items in a specific
order: amulet, right ring, left ring, blindfold, wielded weapon,
order: amulet, ring on main hand (potentially affected by cursed
one-handed weapon), ring on off hand, blindfold, wielded weapon,
secondary or alternate weapon, quiver, suit, cloak, shield, helmet,
gloves, boots, shirt, lit lamps and candles, leashes attached to pets
instead of by object class (sortpack) or inventory letter (!sortpack);

4
src/invent.c
View File

@@ -132,8 +132,8 @@ inuse_classify(Loot *sort_item, struct obj *obj)
/* "Accessories" */
++altclass; /* 4 */
USE_RATING(w_mask & WORN_BLINDF);
USE_RATING(w_mask & LEFT_RING);
USE_RATING(w_mask & RIGHT_RING);
USE_RATING(w_mask & (ULEFTY ? RIGHT_RING : LEFT_RING)); /* off hand */
USE_RATING(w_mask & (URIGHTY ? RIGHT_RING : LEFT_RING)); /* main hand */
USE_RATING(w_mask & WORN_AMUL);
/* if we get here, the USE_RATING() checks failed to find a match */

5
src/zap.c
View File

@@ -4011,10 +4011,9 @@ boomhit(struct obj *obj, coordxy dx, coordxy dy)
register int i, ct;
int boom; /* showsym[] index */
struct monst *mtmp;
boolean counterclockwise = URIGHTY; /* URIGHTY = right-handed throw
else ULEFTY = left-handed throw */
boolean counterclockwise = URIGHTY; /* ULEFTY => clockwise */
/* counterclockwise traversal patterns:
/* counterclockwise traversal patterns, from @ to 1 then on through to 9
* ..........................54.................................
* ..................43.....6..3....765.........................
* ..........32.....5..2...7...2...8...4....87..................