refactor nh_timeout
saner luck expiration

luck expires faster with the amulet/angered god only for positive luck values (yes, without this change angering god causes negative luck to expire faster)