Defense table and Refuge Defense Check Fix

Readded the defense table and refuge fix from Savil's branch