Changeset 10349 in orxonox.OLD for branches/ai/src/ai/ai_team.cc

Timestamp:

Jan 24, 2007, 6:55:21 PM (17 years ago)

Author:

tfahrni

Message:

 

File:

• branches/ai/src/ai/ai_team.cc (modified) (4 diffs)

branches/ai/src/ai/ai_team.cc

@@ -30 +30 @@
 
                 if(it->second->taskDone()){
-                        std::cout << "Swarm Task Complete!\n";
+                        //std::cout << "Swarm Task Complete!\n";
 
                         if(enemyList->size()==0){
@@ -51 +51 @@
                         //find new Position
                         if(isPlayer){
+                                float attackDistance=it->second->getAttackDistance();
+
                                 Vector targetPos=target->getAbsCoor();
                                 int zNorm=(position.z>targetPos.z)?1:-1;
 
                                 if((position.z-targetPos.z)*zNorm>60){  //go to start position
-                                        std::cout << "Go Start Position\n";
+                                        //std::cout << "Go Start Position\n";
                                         changeSwarmModule(it, new SwarmGoRel);
                                         zNorm=1-(rand()%2)*2;   //1 or -1
-                                        newPosition=Vector(190,0,zNorm*10);
+                                        newPosition=Vector(attackDistance+60,0,zNorm*10);
                                         speed=60;
-                                }else if(position.x > targetPos.x+160){ //go to attack position
-                                        std::cout << "Go Attack Position\n";
+                                }else if(position.x > targetPos.x+attackDistance+40){   //go to attack position
+                                        //std::cout << "Go Attack Position\n";
                                         changeSwarmModule(it, new SwarmGoRel);
-                                        newPosition=Vector(130,0,0);
+                                        newPosition=Vector(attackDistance+30,0,0);
                                         speed=60;
-                                }else if(position.x > targetPos.x+120){ //go to attack mode
-                                        std::cout << "Go Attack Mode\n";
+                                }else if(position.x > targetPos.x+attackDistance+20){   //go to attack mode
+                                        //std::cout << "Go Attack Mode\n";
                                         changeSwarmModule(it, new SwarmAttack);
-                                        newPosition=Vector(110,0,0);
+                                        newPosition=Vector(attackDistance,0,0);
                                         speed=60;
                                         maxTime=(rand()%11)+4;//4-14 Sekunden
                                 }else{                                                                                          //go to fallback point
-                                        std::cout << "Go  Fallback Point\n";
+                                        //std::cout << "Go  Fallback Point\n";
                                         changeSwarmModule(it, new SwarmGoRel);
                                         newPosition=Vector(80,0,zNorm*90);
@@ -106 +108 @@
 
 
-void AITeam::addAI(int swarmNumber, WorldEntity* npc)
+void AITeam::addAI(int swarmNumber, WorldEntity* npc, float maxSpeed, float attackDistance)
 {
         std::pair<std::map<int,SwarmModule*>::iterator,bool> p;
@@ -112 +114 @@
         p=swarms.insert(std::make_pair(swarmNumber,newSwarm));
         if(!p.second)delete newSwarm;
-        p.first->second->addAI(npc);
+        p.first->second->addAI(npc, maxSpeed, attackDistance);
 }