4 combo types implemented

4 combo types implemented, Reset penalty still present, only
singleplayer vs AI controls