Updated much of the Tower and Attack logic