[Freecol-commits] freecol/src/net/sf/freecol/common/model Player.java, 1.186, 1.187

[Michael B. <bur...@us...>]

Update of /cvsroot/freecol/freecol/src/net/sf/freecol/common/model
In directory sc8-pr-cvs17:/tmp/cvs-serv1879

Modified Files:
	Player.java 
Log Message:
Fixed bug #[ 1751469 ] William Brewster effect not in keeping with original.


Index: Player.java
===================================================================
RCS file: /cvsroot/freecol/freecol/src/net/sf/freecol/common/model/Player.java,v
retrieving revision 1.186
retrieving revision 1.187
diff -C2 -d -r1.186 -r1.187
*** Player.java	19 Jun 2007 15:16:34 -0000	1.186
--- Player.java	11 Jul 2007 16:19:57 -0000	1.187
***************
*** 2703,2724 ****
       */
      public int generateRecruitable() {
!         int random;
          if (hasFather(FoundingFather.WILLIAM_BREWSTER)) {
!             // Make sure random is a number from 0 to 18:
!             random = (int) (Math.random() * 19);
          } else {
!             // Chance will be a number from 0 to 99 (never 100!):
!             int chance = (int) (Math.random() * 100);
!             if (chance < 21) {
                  return Unit.PETTY_CRIMINAL;
!             } else if (chance < 42) {
                  return Unit.INDENTURED_SERVANT;
!             } else if (chance < 62) {
                  return Unit.FREE_COLONIST;
-             } else {
-                 // Make sure random is a number from 0 to 18:
-                 random = ((chance - 62) / 2);
              }
          }
          switch (random) {
          default:
--- 2703,2724 ----
       */
      public int generateRecruitable() {
!         // Random will be a number from 0 to 99 (never 100!):
!         int random = (int) (Math.random() * 100);
          if (hasFather(FoundingFather.WILLIAM_BREWSTER)) {
!             if (random < 62) {
!                 return Unit.FREE_COLONIST;
!             }
          } else {
!             if (random < 21) {
                  return Unit.PETTY_CRIMINAL;
!             } else if (random < 42) {
                  return Unit.INDENTURED_SERVANT;
!             } else if (random < 62) {
                  return Unit.FREE_COLONIST;
              }
          }
+         // Make sure random is a number from 0 to 18:
+         random = ((random - 62) / 2);
+ 
          switch (random) {
          default: