Merge branch 'NetHack-3.6'

This commit is contained in:
nhmall
2019-05-26 08:18:03 -04:00
7 changed files with 127 additions and 167 deletions

View File

@@ -2023,11 +2023,13 @@ struct mkroom *croom;
might be short-circuited if a monster brings object to hero) */
if (Is_mineend_level(&u.uz)) {
if (otmp->otyp == iflags.mines_prize_type) {
otmp->record_achieve_special = MINES_PRIZE;
/* prevent stacking; cleared when achievement is recorded */
otmp->nomerge = 1;
if (++g.mines_prize_count > 1)
impossible(prize_warning, "mines end");
if (!g.mines_prize_count++) {
/* Note: the first luckstone on lev will become the prize
even if its not the explicit one, but random */
otmp->record_achieve_special = MINES_PRIZE;
/* prevent stacking; cleared when achievement is recorded */
otmp->nomerge = 1;
}
}
} else if (Is_sokoend_level(&u.uz)) {
if (otmp->otyp == iflags.soko_prize_type1) {