From 65b8cf7981671a039e0f48fc2ac484fa2b3e9d67 Mon Sep 17 00:00:00 2001 From: PatR Date: Sat, 24 Sep 2022 15:27:13 -0700 Subject: [PATCH] pull request #850 - level teleporter feedback Pull request from copperwater: don't give "flash of light" feedback when activating a level teleporter because it's too much like one of the outcomes of a magic trap. This doesn't use the suggested commit. Getting the "you feel disoriented" feedback before being asked for destination level (when having teleport control) seemed contradictory. This gives different feedback and does so after the actual teleport. Supersedes #850 and since nhcopier doesn't seem to understand "supersede" Closes #850 --- src/teleport.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/teleport.c b/src/teleport.c index 30b51b66c..8df35115f 100644 --- a/src/teleport.c +++ b/src/teleport.c @@ -1172,7 +1172,7 @@ tele_trap(struct trap *trap) } void -level_tele_trap(struct trap* trap, unsigned int trflags) +level_tele_trap(struct trap *trap, unsigned int trflags) { char verbbuf[BUFSZ]; boolean intentional = FALSE; @@ -1191,13 +1191,14 @@ level_tele_trap(struct trap* trap, unsigned int trflags) You_feel("a wrenching sensation."); return; } - if (!Blind) - You("are momentarily blinded by a flash of light."); - else - You("are momentarily disoriented."); deltrap(trap); newsym(u.ux, u.uy); /* get rid of trap symbol */ level_tele(); + + if (Hallucination || Teleport_control) + You("briefly feel %s.", Hallucination ? "oriented" : "centered"); + else + You_feel("%sdisoriented.", Confusion ? "even more " : ""); /* magic portal traversal causes brief Stun; for level teleport, use confusion instead, and only when hero lacks control; do this after processing the level teleportation attempt because being confused