updated attack computation

This included two-type defenses now.