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:
@@ -2328,7 +2328,7 @@ boolean wep_was_destroyed;
|
||||
You("momentarily stiffen.");
|
||||
} else { /* gelatinous cube */
|
||||
You("are frozen by %s!", mon_nam(mon));
|
||||
nomovemsg = 0; /* default: "you can move again" */
|
||||
nomovemsg = You_can_move_again;
|
||||
nomul(-tmp);
|
||||
exercise(A_DEX, FALSE);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user