Simplying damage formula

So when the move to simplify the formula came through last time, I let it go by because I had a lapse of judgment.

When we changed the first part of the formula from {[Base Damage + Current MP * 0.30) * Charges + ( Bonus Water Damage * Charges + Damage enchants)

To {[(Base Damage + Current MP * 0.3 + Bonus Water Damage) * Charges + Damage Enchants]

We neglected to remind ourselves that the reason the two separate entries for charges were added is because bonus water damage does NOT receive a 6.5x multiplier for a full charge, while the base damage and MP bonus does.

If and when we go about changing our display of the formula, we should make a differentiation between the charges for base + MP damage, and the charges for Bonus Water damage.

I believe the simplest method is to use "Charges" and "Charges' " (Charges prime) in the formula. With Charges prime going with the base + MP damage. So that Charges'= Charges except when charges is =5, in which case charges'=6.5

And as to changing the wording on water damage enchants, I'm in favor of relabeling it to "Bonus Water Damage."