fixed calcs, all shots in one array with types