Make monsters not use camera when hero resists blindness

This commit is contained in:
Pasi Kallinen
2023-12-16 23:34:16 +02:00
parent ae80e7db47
commit 0a8f919ff3
+4 -3
View File
@@ -1465,7 +1465,8 @@ find_offensive(struct monst *mtmp)
} }
nomore(MUSE_CAMERA); nomore(MUSE_CAMERA);
if (obj->otyp == EXPENSIVE_CAMERA if (obj->otyp == EXPENSIVE_CAMERA
&& (!Blind || hates_light(gy.youmonst.data)) && ((!Blind && !resists_blnd(&gy.youmonst))
|| hates_light(gy.youmonst.data))
&& dist2(mtmp->mx, mtmp->my, mtmp->mux, mtmp->muy) <= 2 && dist2(mtmp->mx, mtmp->my, mtmp->mux, mtmp->muy) <= 2
&& obj->spe > 0 && !rn2(6)) { && obj->spe > 0 && !rn2(6)) {
gm.m.offensive = obj; gm.m.offensive = obj;
@@ -1817,12 +1818,12 @@ use_offensive(struct monst *mtmp)
if (Hallucination) { if (Hallucination) {
SetVoice(mtmp, 0, 80, 0); SetVoice(mtmp, 0, 80, 0);
verbalize("Say cheese!"); verbalize("Say cheese!");
} else { } else if (!Blind) {
pline("%s takes a picture of you with %s!", pline("%s takes a picture of you with %s!",
Monnam(mtmp), an(xname(otmp))); Monnam(mtmp), an(xname(otmp)));
} }
gm.m_using = TRUE; gm.m_using = TRUE;
if (!Blind) { if (!Blind && !resists_blnd(&gy.youmonst)) {
You("are blinded by the flash of light!"); You("are blinded by the flash of light!");
make_blinded(BlindedTimeout + (long) rnd(1 + 50), FALSE); make_blinded(BlindedTimeout + (long) rnd(1 + 50), FALSE);
} }