reimplement pull request #944 - grave contents
Pull request from entrez: if bones left dead hero's corpse on top of a new grave, don't find a corpse or summon a zombie when digging the grave up. It also removed the chance that a ghoul might be summoned when engraving on a headstone, switching to zombie or mummy instead. Rather than adopting the pull request, this retains summoning a ghoul via engraving and adds the possibly of doing so when kicking a headstone. Having a ghoul prowl around the grave is independent of whether there is a corpse or zombie inside the grave. To achieve this, another flag in 'struct rm' is needed; the single bit for 'disturbed' isn't sufficient. The bigger 'flags' field wasn't in use for graves so commandeer that for new 'emptygrave'. 'disturbed' still uses the 'horizontal' bit in order to have engraving and/or kicking summon at most one ghoul. Closes #944
This commit is contained in:
@@ -828,6 +828,7 @@ extern void engr_stats(const char *, char *, long *, long *);
|
||||
extern void del_engr(struct engr *);
|
||||
extern void rloc_engr(struct engr *);
|
||||
extern void make_grave(coordxy, coordxy, const char *);
|
||||
extern void disturb_grave(coordxy, coordxy);
|
||||
|
||||
/* ### exper.c ### */
|
||||
|
||||
|
||||
@@ -328,10 +328,12 @@ struct rm {
|
||||
#define drawbridgemask flags /* what's underneath when the span is open */
|
||||
#define looted flags /* used for throne, tree, fountain, sink, door */
|
||||
#define icedpool flags /* used for ice (in case it melts) */
|
||||
#define emptygrave flags /* no corpse in grave */
|
||||
/* horizonal applies to walls, doors (including sdoor); also to iron bars
|
||||
even though they don't have separate symbols for horizontal and vertical */
|
||||
#define blessedftn horizontal /* a fountain that grants attribs */
|
||||
#define disturbed horizontal /* a grave that has been disturbed */
|
||||
#define disturbed horizontal /* kicking or engraving on a grave's headstone
|
||||
* has summoned a ghoul */
|
||||
|
||||
struct damage {
|
||||
struct damage *next;
|
||||
|
||||
Reference in New Issue
Block a user