[cavedude]

This looks to be a good fix, and makes things more Live Like. It does make some encounters more difficult due to other broken systems, but that is no fault of this code. Moving to submissions.