These days, it is the fighting carbine and pistol, as well as unarmed combative skills. The more things change, the more they stay the same.
Watch this Jim West series also. I know Jim from the old days at Ft Bragg. He is the real deal. He makes a salient point toward the end of the first segment. "You have to be willing to hurt people."