Minor Patch Combat

Standardized unit combat logic to mitigate memory crashes, and surrender logic.