Updated weapon section to use global bonuses and advantage/disadvantage mechanics as per #9 and #10