Adding the ranges as factor would sure help, you could even have it, again, in tiers of how easy/hard it is to hit with your weapon or against the other's defense