[Freecol-commits] freecol/src/net/sf/freecol/server/generator MapGenerator.java,1.52,1.53 River.java,1.4,1.5

[Stian G. <sti...@us...>]

Update of /cvsroot/freecol/freecol/src/net/sf/freecol/server/generator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22767/src/net/sf/freecol/server/generator

Modified Files:
	MapGenerator.java River.java 
Log Message:
Fixes an AI-related bug which caused some carriers to remain in America when they really should be going to Europe. The AI now gets some extras when playing in singleplayer mode.

Index: MapGenerator.java
===================================================================
RCS file: /cvsroot/freecol/freecol/src/net/sf/freecol/server/generator/MapGenerator.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** MapGenerator.java	5 Apr 2006 12:47:00 -0000	1.52
--- MapGenerator.java	9 Apr 2006 13:41:33 -0000	1.53
***************
*** 146,154 ****
                  if (riverMap.get(position) == null) {
                      if (river.flowFromSource(position)) {
!                         logger.info("Created new river with length " + river.getLength());
                          counter++;
                          break;
                      } else {
!                         logger.info("Failed to generate river.");
                      }
                  }
--- 146,154 ----
                  if (riverMap.get(position) == null) {
                      if (river.flowFromSource(position)) {
!                         logger.fine("Created new river with length " + river.getLength());
                          counter++;
                          break;
                      } else {
!                         logger.fine("Failed to generate river.");
                      }
                  }

Index: River.java
===================================================================
RCS file: /cvsroot/freecol/freecol/src/net/sf/freecol/server/generator/River.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** River.java	8 Apr 2006 15:38:35 -0000	1.4
--- River.java	9 Apr 2006 13:41:33 -0000	1.5
***************
*** 76,80 ****
          this.map = map;
          this.riverMap = riverMap;
!         logger.info("Starting new river");
      }
  
--- 76,80 ----
          this.map = map;
          this.riverMap = riverMap;
!         logger.fine("Starting new river");
      }
  
***************
*** 190,209 ****
          Tile tile = map.getTile(position);
          if (!tile.isLand()) {
!             logger.info("Tile at " + position + " is water.");
              return false;
          } else if (tile.getAddition() != Tile.ADD_NONE) {
!             logger.info("Tile at " + position + " has additions.");
              return false;
          } else if (tile.getType() == Tile.DESERT) {
!             logger.info("Tile at " + position + " is desert.");
              return false;
          } else if (tile.getType() == Tile.ARCTIC) {
!             logger.info("Tile at " + position + " is arctic.");
              return false;
          } else if (isNextToWater(position)) {
!             logger.info("Tile at " + position + " is next to water.");
              return false;
          } else {
!             logger.info("Tile at " + position + " is suitable source.");
              return flow(position);
          }
--- 190,209 ----
          Tile tile = map.getTile(position);
          if (!tile.isLand()) {
!             logger.fine("Tile at " + position + " is water.");
              return false;
          } else if (tile.getAddition() != Tile.ADD_NONE) {
!             logger.fine("Tile at " + position + " has additions.");
              return false;
          } else if (tile.getType() == Tile.DESERT) {
!             logger.fine("Tile at " + position + " is desert.");
              return false;
          } else if (tile.getType() == Tile.ARCTIC) {
!             logger.fine("Tile at " + position + " is arctic.");
              return false;
          } else if (isNextToWater(position)) {
!             logger.fine("Tile at " + position + " is next to water.");
              return false;
          } else {
!             logger.fine("Tile at " + position + " is suitable source.");
              return flow(position);
          }
***************
*** 343,355 ****
              case 1:
                  tile.addRiver(Tile.ADD_RIVER_MINOR, section.getBranches());
!                 logger.info("Added minor river to tile at " + section.position);
                  break;
              case 2:
                  tile.addRiver(Tile.ADD_RIVER_MAJOR, section.getBranches());
!                 logger.info("Added major river to tile at " + section.position);
                  break;
              default:
                  tile.setType(Tile.OCEAN);
!             logger.info("Created fjord at " + section.position);
              }
              oldSection = section;
--- 343,355 ----
              case 1:
                  tile.addRiver(Tile.ADD_RIVER_MINOR, section.getBranches());
!                 logger.fine("Added minor river to tile at " + section.position);
                  break;
              case 2:
                  tile.addRiver(Tile.ADD_RIVER_MAJOR, section.getBranches());
!                 logger.fine("Added major river to tile at " + section.position);
                  break;
              default:
                  tile.setType(Tile.OCEAN);
!             logger.fine("Created fjord at " + section.position);
              }
              oldSection = section;