Bug - Fixed Maximizer suggests Blood Sugar Sauce Magic even if it is already active.

When maximizing for mp the maximizer suggests the intrinsic Blood Sugar Sauce Magic even if it is already active. Selecting it will cast it, thus removing Blood Sugar Sauce Magic and lowering my mp.

Fortunately it is still recommended so that it I can select it again and restore it.

Probably simple to fix, like intrinsics aren't counted amongst active buffs.

I would guess it's because there are two different skills with the same name: one which you get if you are a Sauceror (the second one) and one which you get if you are any other class (the first one).

We have a single modifier which accounts for both effects.

Presumably, we should have this:

and presumably special knowledge somewhere else that the first is what you get if you use skill as a non-Sauceror and 2nd is what you get if you are a Sauceror.

I don't know what, exactly, that would be. Perhaps Darzil, our current expert on the maximizer and on skills-and-items-with-identical-names has an idea.

I will endeavour to have a think and a play and an idea. Fortunately I think I'm avoiding hotels for the next week.

I think r15907 should fix all the contributing issues.
Modifiers I've changed as suggested by Veracity, though I don't think it mattered.
Added restrictions on which effect you get with which class with the skill.
Checking those restrictions now based on effect id rather than name.