Water Delivery: Hotfix #5

Made lots of optimizations to the mansion level. Frame rates should be dramatically improved for lower end machines on the mansion level.