M29 - unconscious effects when not unconscious
While auditing nomul() I noticed unconscious() treats (multi < 0 && !nomovemsg) as unconscious. This explains the behavior in M29 (unconscious message while performing #turn). I checked all the places with this combination, and found a few that did not appear to fall under the "unconscious" category. Most I changed to use You_can_move_again to ensure the same display w/o the unconscious behavior. Also: - found another string that unconscious() should have considered - vomit() now sets nomovemsg, one caller was also doing this redundantly - vomiting_dialogue() was calling stop_occupation() after vomit(), which can reset multi. I reversed the order and removed a doubly-redundant nomul call. tele() still has a problem: some cases where multi < 0 should probably take a branch like the unconscious() branch but with a different message. doturn()'s behavior - turn then wait - is also less than perfect, but I think this is a known problem.
This commit is contained in:
@@ -633,7 +633,7 @@ hurtle(dx, dy, range, verbose)
|
||||
if(!range || (!dx && !dy) || u.ustuck) return; /* paranoia */
|
||||
|
||||
nomul(-range);
|
||||
nomovemsg = 0;
|
||||
nomovemsg = ""; /* it just happens */
|
||||
if (verbose)
|
||||
You("%s in the opposite direction.", range > 1 ? "hurtle" : "float");
|
||||
/* if we're in the midst of shooting multiple projectiles, stop */
|
||||
|
||||
Reference in New Issue
Block a user