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

expanded feedback for "in quiver" (trunk only)

Browse Source 
Replace quiver with quiver/quiver pouch/at the ready as appropriate.
This commit is contained in:
keni
2009-05-10 16:33:57 +00:00
parent 28a8f7d858
commit 45e7a0cd6a
3 changed files with 60 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/objnam.c
View File

@@ -877,7 +877,37 @@ ring:
else
Strcat(bp, " (alternate weapon; not wielded)");
}
if(obj->owornmask & W_QUIVER) Strcat(bp, " (in quiver)");
if(obj->owornmask & W_QUIVER){
switch(obj->oclass){
case WEAPON_CLASS:
if(is_ammo(obj)){
if(objects[obj->otyp].oc_skill == -P_BOW){
/* Ammo for a bow */
Strcat(bp, " (in quiver)");
break;
} else {
/* Ammo not for a bow */
Strcat(bp, " (in quiver pouch)");
break;
}
} else {
/* Weapons not considered ammo */
Strcat(bp, " (at the ready)");
break;
}
/* Small things and ammo not for a bow */
case RING_CLASS:
case AMULET_CLASS:
case WAND_CLASS:
case COIN_CLASS:
case GEM_CLASS:
Strcat(bp, " (in quiver pouch)");
break;
default: /* odd things */
Strcat(bp, " (at the ready)");
}
}
if (!iflags.suppress_price && is_unpaid(obj)) {
long quotedprice = unpaid_cost(obj, TRUE);