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

Fix strange object mimic in shop sanity error

Browse Source 
Shop population code set the mimic shape to strange object
without checking for protection from shape changers.
Let set_mimic_sym (via makemon) handle it correctly instead.
This commit is contained in:
Pasi Kallinen
2021-06-26 13:03:28 +03:00
parent ddf9eb0688
commit b5dd0f8986
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/makemon.c
+4
View File
@@ -2212,6 +2212,10 @@ set_mimic_sym(register struct monst *mtmp)
*/ */
} else if (rt >= SHOPBASE) { } else if (rt >= SHOPBASE) {
if (rn2(10) >= depth(&u.uz)) {
s_sym = S_MIMIC_DEF; /* -> STRANGE_OBJECT */
goto assign_sym;
}
s_sym = get_shop_item(rt - SHOPBASE); s_sym = get_shop_item(rt - SHOPBASE);
if (s_sym < 0) { if (s_sym < 0) {
ap_type = M_AP_OBJECT; ap_type = M_AP_OBJECT;
src/shknam.c
+1 -5
View File
@@ -463,11 +463,7 @@ mkshobj_at(const struct shclass* shp, int sx, int sy, boolean mkspecl)
if (rn2(100) < depth(&u.uz) && !MON_AT(sx, sy) if (rn2(100) < depth(&u.uz) && !MON_AT(sx, sy)
&& (ptr = mkclass(S_MIMIC, 0)) != 0 && (ptr = mkclass(S_MIMIC, 0)) != 0
&& (mtmp = makemon(ptr, sx, sy, NO_MM_FLAGS)) != 0) { && (mtmp = makemon(ptr, sx, sy, NO_MM_FLAGS)) != 0) {
/* note: makemon will set the mimic symbol to a shop item */ /* nothing */
if (rn2(10) >= depth(&u.uz)) {
mtmp->m_ap_type = M_AP_OBJECT;
mtmp->mappearance = STRANGE_OBJECT;
}
} else { } else {
atype = get_shop_item((int) (shp - shtypes)); atype = get_shop_item((int) (shp - shtypes));
if (atype == VEGETARIAN_CLASS) if (atype == VEGETARIAN_CLASS)