Thread: [Freeorion-programmers] SF.net SVN: freeorion:[3036] trunk/FreeOrion/default/AI

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 3036
          http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3036&view=rev
Author:   geoffthemedio
Date:     2009-05-13 07:52:00 +0000 (Wed, 13 May 2009)

Log Message:
-----------
AI patch by OndrejR

Modified Paths:
--------------
    trunk/FreeOrion/default/AI/AIFleetMission.py
    trunk/FreeOrion/default/AI/ExplorationAI.py
    trunk/FreeOrion/default/AI/FleetUtilsAI.py
    trunk/FreeOrion/default/AI/MoveUtilsAI.py

Modified: trunk/FreeOrion/default/AI/AIFleetMission.py
===================================================================

--- trunk/FreeOrion/default/AI/AIFleetMission.py	2009-05-12 04:21:32 UTC (rev 3035)
+++ trunk/FreeOrion/default/AI/AIFleetMission.py	2009-05-13 07:52:00 UTC (rev 3036)
@@ -111,7 +111,9 @@
          
         result = ""
         for aiFleetMissionType in self.getAIFleetMissionTypes():
-            targetsString = "fleet:" + str(self.getFleetID()) + "[" + str(aiFleetMissionType) + "]:" 
+            universe = fo.getUniverse()
+            fleet = universe.getFleet(self.getFleetID())
+            targetsString = "fleet name:" + fleet.name + " id:"+ str(self.getFleetID()) + "[" + str(aiFleetMissionType) + "]:" 
             targets = self.getAITargets(aiFleetMissionType)
             for target in targets:
                 targetsString = targetsString + str(target) 
@@ -247,7 +249,20 @@
             
         for aiFleetOrder in aiFleetOrdersToVisitSystems:
             self.appendAIFleetOrder(aiFleetOrder)
+            
+    def getLocationAITarget(self):
+        "system AITarget where fleet is or will be"
+        # TODO add parameter turn
         
+        universe = fo.getUniverse()
+        fleet = universe.getFleet(self.getFleetID())
+        systemID = fleet.systemID
+        if systemID >=0:
+            return AITarget.AITarget(AITargetType.TARGET_SYSTEM, systemID)
+        else:
+            return AITarget.AITarget(AITargetType.TARGET_SYSTEM, fleet.nextSystemID)
+        
+        
 def getFleetIDsFromAIFleetMissions(aiFleetMissions):
     result = []
     for aiFleetMission in aiFleetMissions:

Modified: trunk/FreeOrion/default/AI/ExplorationAI.py
===================================================================
--- trunk/FreeOrion/default/AI/ExplorationAI.py	2009-05-12 04:21:32 UTC (rev 3035)
+++ trunk/FreeOrion/default/AI/ExplorationAI.py	2009-05-13 07:52:00 UTC (rev 3036)
@@ -3,6 +3,7 @@
 import FleetUtilsAI
 from EnumsAI import AIFleetMissionType, AIExplorableSystemType, AITargetType
 import AITarget
+import MoveUtilsAI
 
 def assignScoutsToExploreSystems():
     # TODO: use Graph Theory to explore closest systems
@@ -24,9 +25,10 @@
             if foAI.foAIstate.hasAITarget(AIFleetMissionType.FLEET_MISSION_EXPLORATION, aiTarget):
                 continue
             
-            # add exploration mission to fleet with target unexplored system
-            aiFleetMission.addAITarget(AIFleetMissionType.FLEET_MISSION_EXPLORATION, aiTarget)
-            break
+            # add exploration mission to fleet with target unexplored system and this system is in range
+            if len(MoveUtilsAI.canTravelToSystemAndReturnToResupply(fleetID, aiFleetMission.getLocationAITarget(), aiTarget, fo.empireID())) > 0:
+                aiFleetMission.addAITarget(AIFleetMissionType.FLEET_MISSION_EXPLORATION, aiTarget)
+                break
         
 def getHomeSystemID():
     "returns the systemID of the home world"

Modified: trunk/FreeOrion/default/AI/FleetUtilsAI.py
===================================================================
--- trunk/FreeOrion/default/AI/FleetUtilsAI.py	2009-05-12 04:21:32 UTC (rev 3035)
+++ trunk/FreeOrion/default/AI/FleetUtilsAI.py	2009-05-13 07:52:00 UTC (rev 3036)
@@ -175,6 +175,8 @@
 def issueAIFleetOrdersForAIFleetMissions():
     "issues fleet orders"
     
+    print ""
+    print "issuing fleet orders:"
     aiFleetMissions = foAI.foAIstate.getAllAIFleetMissions()
     for aiFleetMission in aiFleetMissions:
         aiFleetMission.issueAIFleetOrders()

Modified: trunk/FreeOrion/default/AI/MoveUtilsAI.py
===================================================================
--- trunk/FreeOrion/default/AI/MoveUtilsAI.py	2009-05-12 04:21:32 UTC (rev 3035)
+++ trunk/FreeOrion/default/AI/MoveUtilsAI.py	2009-05-13 07:52:00 UTC (rev 3036)
@@ -1,3 +1,4 @@
+import freeOrionAIInterface as fo
 from EnumsAI import AITargetType, AIFleetOrderType
 import AITarget
 import AIFleetOrder
@@ -5,10 +6,112 @@
 def getAIFleetOrdersFromSystemAITargets(fleetID, aiTargets):
     result = []
     # TODO: use Graph Theory to construct move orders
-    # TODO: take fuel into account
-    fleetAITarget = AITarget.AITarget(AITargetType.TARGET_FLEET, fleetID) 
+    # TODO: add priority
+    fleetAITarget = AITarget.AITarget(AITargetType.TARGET_FLEET, fleetID)
+    empireID = fo.empireID()
+    # determine system where fleet will be or where is if is going nowhere
+    lastSystemAITarget = fleetAITarget.getRequiredSystemAITargets()[0]
+    # for every system which fleet wanted to visit, determine systems to visit and create move orders 
     for aiTarget in aiTargets:
-        aiFleetOrder = AIFleetOrder.AIFleetOrder(AIFleetOrderType.ORDER_MOVE, fleetAITarget, aiTarget)
-        result.append(aiFleetOrder)
+        # determine systems required to visit(with possible return to supplied system)
+        systemAITargets = canTravelToSystemAndReturnToResupply(fleetID, lastSystemAITarget, aiTarget, empireID)
+        if len(systemAITargets) > 0:
+            # for every system required to visit create move order
+            for systemAITarget in systemAITargets:
+                # remember last system which will be visited
+                lastSystemAITarget = systemAITarget
+                # create move order
+                aiFleetOrder = AIFleetOrder.AIFleetOrder(AIFleetOrderType.ORDER_MOVE, fleetAITarget, systemAITarget)
+                result.append(aiFleetOrder)
+        else:
+            print "fleetID: " + str(fleetID) + " can't travel to target:" + str(aiTarget)
         
     return result
+
+def canTravelToSystemAndReturnToResupply(fleetID, fromSystemAITarget, toSystemAITarget, empireID):
+    "check if fleet can travel from starting system to wanted system"
+    
+    systemAITargets = []
+    if not fromSystemAITarget.getTargetID() == toSystemAITarget.getTargetID:
+        # get supplyable systems
+        empire = fo.getEmpire()
+        fleetSupplyableSystemIDs = empire.fleetSupplyableSystemIDs
+        # get current fuel and max fuel
+        universe = fo.getUniverse()
+        fleet = universe.getFleet(fleetID)
+        maxFuel = int(fleet.maxFuel)
+        fuel = int(fleet.fuel)
+        
+        # try to find path without going resupply first
+        supplySystemID = getNearestSuppliedSystem(toSystemAITarget.getTargetID(), empireID)
+        systemAITargets = __findPathWithFuelToSystemWithPossibleReturn(fromSystemAITarget, toSystemAITarget, empireID, systemAITargets, fleetSupplyableSystemIDs, maxFuel, fuel, supplySystemID)
+        # resupply in system first is required to find path
+        if not(fromSystemAITarget.getTargetID() in fleetSupplyableSystemIDs) and len(systemAITargets)==0:
+            # add supply system to visit
+            supplySystemID = getNearestSuppliedSystem(fromSystemAITarget.getTargetID(), empireID)
+            fromSystemAITarget = AITarget.AITarget(AITargetType.TARGET_SYSTEM, supplySystemID)
+            systemAITargets.append(fromSystemAITarget)
+            # find path from supplied system to wanted system
+            supplySystemID = getNearestSuppliedSystem(toSystemAITarget.getTargetID(), empireID)
+            systemAITargets = __findPathWithFuelToSystemWithPossibleReturn(fromSystemAITarget, toSystemAITarget, empireID, systemAITargets, fleetSupplyableSystemIDs, maxFuel, maxFuel, supplySystemID)
+        
+    return systemAITargets
+
+def getNearestSuppliedSystem(startSystemID, empireID):
+    "returns systemID of nearest supplied system from starting system startSystemID"
+    
+    empire = fo.getEmpire()
+    fleetSupplyableSystemIDs = empire.fleetSupplyableSystemIDs
+    universe = fo.getUniverse()
+    
+    if startSystemID in fleetSupplyableSystemIDs:
+        return startSystemID
+    else:
+        minJumps = 9999 # infinity
+        supplySystemID = -1
+        for systemID in fleetSupplyableSystemIDs:
+            leastJumpsPath = universe.leastJumpsPath(startSystemID, systemID, empireID)
+            if len(leastJumpsPath) < minJumps:
+                minJumps = len(leastJumpsPath)
+                supplySystemID = systemID
+        
+        return supplySystemID
+
+def __findPathWithFuelToSystemWithPossibleReturn(fromSystemAITarget, toSystemAITarget, empireID, resultSystemAITargets, fleetSupplyableSystemIDs, maxFuel, fuel, supplySystemID):
+    "returns system AITargets required to visit with fuel to nearest supplied system"
+
+    result = True
+    # try to find if there is possible path to wanted system from system
+    universe = fo.getUniverse()
+    leastJumpsPath = universe.leastJumpsPath(fromSystemAITarget.getTargetID(), toSystemAITarget.getTargetID(), empireID)
+    fromSystemID = fromSystemAITarget.getTargetID()
+    for systemID in leastJumpsPath:
+        if not fromSystemID == systemID:
+            if fromSystemID in fleetSupplyableSystemIDs:
+                # from supplied system fleet can travel without fuel consumption and also in this system refuels
+                fuel = maxFuel
+                # too long paths tends to be out of range although it is valid path. It is caused by leastJumpsPath
+                if not systemID == toSystemAITarget.getTargetID():
+                    resultSystemAITargets.append(AITarget.AITarget(AITargetType.TARGET_SYSTEM, systemID))
+            else:
+                fuel = fuel - 1
+                
+            if fuel < 0:
+                result = False
+                
+        fromSystemID = systemID 
+        # if there is path to wanted system, then also if there is path back to supplyable system
+    if result == True:
+        # jump from A to B means leastJumpsPath=[A,B], but minJumps=1
+        minJumps = len(universe.leastJumpsPath(toSystemAITarget.getTargetID(), supplySystemID, empireID)) - 1
+
+        if minJumps > fuel:
+            # print "fleetID:" + str(fleetID) + " fuel:" + str(fuel) + " required: " + str(minJumps)
+            result = False
+        else:
+            resultSystemAITargets.append(toSystemAITarget)
+    
+    if result == False:
+        resultSystemAITargets = []
+    
+    return resultSystemAITargets






Thread: [Freeorion-programmers] SF.net SVN: freeorion:[3036] trunk/FreeOrion/default/AI

4X Space Strategy Game

freeorion-programmers