From a bug report: monsters hit by polymorph
magic while wearing dragon scales/scale mail were being turned into random monsters instead of into dragons. Also Two items from <Someone>'s list. Files patched: include/obj.h src/mon.c, muse.c, worn.c, zap.c
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
/* SCCS Id: @(#)obj.h 3.3 1999/12/13 */
|
||||
/* SCCS Id: @(#)obj.h 3.3 2002/01/07 */
|
||||
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -199,6 +199,18 @@ struct obj {
|
||||
#define Is_mbag(otmp) (otmp->otyp == BAG_OF_HOLDING || \
|
||||
otmp->otyp == BAG_OF_TRICKS)
|
||||
|
||||
/* dragon gear */
|
||||
#define Is_dragon_scales(obj) ((obj)->otyp >= GRAY_DRAGON_SCALES && \
|
||||
(obj)->otyp <= YELLOW_DRAGON_SCALES)
|
||||
#define Is_dragon_mail(obj) ((obj)->otyp >= GRAY_DRAGON_SCALE_MAIL && \
|
||||
(obj)->otyp <= YELLOW_DRAGON_SCALE_MAIL)
|
||||
#define Is_dragon_armor(obj) (Is_dragon_scales(obj) || Is_dragon_mail(obj))
|
||||
#define Dragon_scales_to_pm(obj) &mons[PM_GRAY_DRAGON + (obj)->otyp \
|
||||
- GRAY_DRAGON_SCALES]
|
||||
#define Dragon_mail_to_pm(obj) &mons[PM_GRAY_DRAGON + (obj)->otyp \
|
||||
- GRAY_DRAGON_SCALE_MAIL]
|
||||
#define Dragon_to_scales(pm) (GRAY_DRAGON_SCALES + (pm - mons))
|
||||
|
||||
/* Light sources */
|
||||
#define Is_candle(otmp) (otmp->otyp == TALLOW_CANDLE || \
|
||||
otmp->otyp == WAX_CANDLE)
|
||||
|
||||
Reference in New Issue
Block a user