From: nhmall Date: Fri, 7 Jun 2019 01:49:54 +0000 (-0400) Subject: Merge branch 'NetHack-3.6' X-Git-Tag: NetHack-3.7.0_WIP~385 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa2fb2932f97b8d6f1a4947a4de22d04b176aca1;p=nethack Merge branch 'NetHack-3.6' --- aa2fb2932f97b8d6f1a4947a4de22d04b176aca1 diff --cc src/pray.c index 3fba7f573,7626b7487..5bc7e6eba --- a/src/pray.c +++ b/src/pray.c @@@ -2053,11 -2058,15 +2054,15 @@@ doturn( * Paralysis duration probably ought to be based on the strengh * of turned creatures rather than on turner's level. * Why doesn't this honor Free_action? [Because being able to - * repeat #turn every turn would be too powerful.] + * repeat #turn every turn would be too powerful. Maybe instead + * of nomul(-N) we should add the equivalent of mon->mspec_used + * for the hero and refuse to #turn when it's non-zero? Or have + * both and u.uspec_used only matters when Free_action prevents + * the brief paralysis?] */ nomul(-(5 - ((u.ulevel - 1) / 6))); /* -5 .. -1 */ - multi_reason = "trying to turn the monsters"; - nomovemsg = You_can_move_again; + g.multi_reason = "trying to turn the monsters"; + g.nomovemsg = You_can_move_again; return 1; }