I think this solves a lot of problems! By making it similar to Melee, it all makes sense. Also If the defender doesn't have a ranged weapon, they don't deal damage if they roll high, instead they just don't get hurt.
