Implement new Conversion mechanics
Sucker Punch fails against a recharging target
Merge remote-tracking branch 'upstream/master'