#3374 "Turns to increase rebels" tooltip is wrong

[fouss]

In the colony panel, the tooltip that shows extra information about Sons of Liberty does not calculate correctly the turns remaining to increase rebels in the colony. Although it shows correct values for turns until 50% and 100% liberty. The value of "Turns to increase rebels" is always equal to the value below, that is the turns needed to reach the next bonus.

I believe that the bug can be found in the 'common/model/Colony.java' file, in the function called rebelHelper().

The following line can be changed:
if (bonus != bonus0 && ret.get(0) < 0) {
to:
if (next != rc && ret.get(0) < 0) {

where rc should be outside the for (;;;) loop, as:
int rc = calculateRebelCount(uc, soLPercent);
while next should be inside the for (;;;) loop, also as:
next = calculateRebelCount(uc, soLPercent);

Tell me if you need a patch.
Hope that helps.

[Bernat]

Hello, Fouss!

Great fix!
It should be corrected in the next version.
Thank you for the detailed and accurate description, it's very helpful!

We have also added a new feature for calculating future bonuses.
If you want to check the code, you can see it here:
https://sourceforge.net/p/freecol/git/merge-requests/72/

Thank you for your contribution!