Fixed broken combat encounters allowing movement.

Also added a new fluid type.