Numhits system revised

Revision of the numhits system to be consistent with live. Now check conditions using 'numhits type' field instead of by individual spell effect.