Separated roll values and tweaked bonuses

Silverdisc's changes:
- Changed CCA rolls
- Normal roll value doesn't include the gain anymore
- Gain doesn't include the weapongain
- Weapongain is displayed seperately
	
- Usage: in RP, depending on the situation, add gain and weapon gain yourself.