Look at the trillions of TODO in the patch, which were mostly some random thoughts I had while coding, and comment if they are wanted/required.
Decide how the user wants to choose (hotkeys like here, or more of an "on"/"off" setting per attackType)
Don't worry reviewing the patch atm, some parts should be stripped of first. Some black-box testing might be useful instead.