Revert "Revert "Changes to attack and defense.""

This reverts commit a1454c99f3226a87de995e5215c2fad220f4a999.