[Freecol-commits] SF.net SVN: freecol:[9579] freecol/trunk/src/net/sf/freecol/server/ai/ AIColony.java

[<mp...@us...>]

Revision: 9579
          http://freecol.svn.sourceforge.net/freecol/?rev=9579&view=rev
Author:   mpope
Date:     2012-01-24 08:49:38 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
Give wider choice of missions to available AI colony units.

Modified Paths:
--------------
    freecol/trunk/src/net/sf/freecol/server/ai/AIColony.java

Modified: freecol/trunk/src/net/sf/freecol/server/ai/AIColony.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/server/ai/AIColony.java	2012-01-24 08:46:09 UTC (rev 9578)
+++ freecol/trunk/src/net/sf/freecol/server/ai/AIColony.java	2012-01-24 08:49:38 UTC (rev 9579)
@@ -64,6 +64,8 @@
 import net.sf.freecol.server.ai.mission.DefendSettlementMission;
 import net.sf.freecol.server.ai.mission.IdleAtColonyMission;
 import net.sf.freecol.server.ai.mission.Mission;
+import net.sf.freecol.server.ai.mission.PioneeringMission;
+import net.sf.freecol.server.ai.mission.ScoutingMission;
 import net.sf.freecol.server.ai.mission.TransportMission;
 import net.sf.freecol.server.ai.mission.WorkInsideColonyMission;
 
@@ -412,10 +414,25 @@
             aiU.setMission(new WorkInsideColonyMission(aiMain, aiU, this));
         }
         for (Unit u : tile.getUnitList()) {
-            if (u.isArmed()) {
-                AIUnit aiU = getAIUnit(u);
+            AIUnit aiU = getAIUnit(u);
+            switch (u.getRole()) {
+            case SOLDIER: case DRAGOON:
                 aiU.setMission(new DefendSettlementMission(aiMain, aiU,
-                        colony));
+                                                           colony));
+                break;
+            case SCOUT:
+                if (ScoutingMission.isValid(aiU)) {
+                    aiU.setMission(new ScoutingMission(aiMain, aiU));
+                }
+                break;
+            case PIONEER:
+                if (PioneeringMission.isValid(aiU)) {
+                    aiU.setMission(new PioneeringMission(aiMain, aiU));
+                }
+                break;
+            // TODO: case MISSIONARY:
+            default:
+                break;
             }
         }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.