Changeset 10283 in orxonox.OLD for branches

Timestamp:

Jan 17, 2007, 9:06:56 PM (18 years ago)

Author:

tfahrni

Message:

 

Location:

branches/ai/src/ai

Files:

• ai_team.cc (modified) (2 diffs)
• attack_module.cc (modified) (1 diff)
• movement_module.cc (modified) (1 diff)
• swarm_gorel.cc (modified) (2 diffs)

branches/ai/src/ai/ai_team.cc

@@ -57 +57 @@
                                         std::cout << "Go Start Position\n";
                                         changeSwarmModule(it, new SwarmGoRel);
-                                        newPosition=Vector(180,0,zNorm*60);
-                                        speed=80;
-                                }else if(position.x > targetPos.x+150){ //go to attack position
+                                        zNorm=1-(rand()%2)*2;   //1 or -1
+                                        newPosition=Vector(190,0,zNorm*10);
+                                        speed=60;
+                                }else if(position.x > targetPos.x+160){ //go to attack position
                                         std::cout << "Go Attack Position\n";
                                         changeSwarmModule(it, new SwarmGoRel);
-                                        newPosition=Vector(100,0,0);
-                                        speed=80;
-                                }else if(position.x > targetPos.x+90){  //go to attack mode
+                                        newPosition=Vector(130,0,0);
+                                        speed=60;
+                                }else if(position.x > targetPos.x+120){ //go to attack mode
                                         std::cout << "Go Attack Mode\n";
                                         changeSwarmModule(it, new SwarmAttack);
-                                        newPosition=Vector(80,0,0);
-                                        speed=80;
-                                        maxTime=(rand()%11);//0-10 Sekunden
+                                        newPosition=Vector(110,0,0);
+                                        speed=60;
+                                        maxTime=(rand()%11)+2;//2-12 Sekunden
                                 }else{                                                                                          //go to fallback point
                                         std::cout << "Go  Fallback Point\n";
                                         changeSwarmModule(it, new SwarmGoRel);
-                                        newPosition=Vector(0,0,zNorm*100);
+                                        newPosition=Vector(80,0,zNorm*90);
                                         speed=80;
                                 }
@@ -80 +81 @@
                         }
 
-
+                        speed=0;
 
                         if(enemyList->size()>0){

branches/ai/src/ai/attack_module.cc

@@ -144 +144 @@
         //rotate NPC
         view = target->getAbsCoor()-myPosition;
+        Vector randomView=view.cross(Vector(0,1,0)).getNormalized();
+        randomView=randomView*((rand()%4)-2);
+
+        view = target->getAbsCoor()+randomView-myPosition;
         view = view.cross( Vector(0,1,0) ).getNormalized();
 

branches/ai/src/ai/movement_module.cc

@@ -33 +33 @@
 SHELL_COMMAND(setTestValue2, MovementModule, setTestValue2);
 
-float MovementModule::distanceToPlayer=15;
+float MovementModule::distanceToPlayer=30;
 float MovementModule::distanceToNPC=2;
 float MovementModule::maxAccleration=250.0f;

branches/ai/src/ai/swarm_gorel.cc

@@ -28 +28 @@
         }
         averageRadius=averageRadius/members.size();
-        aMax=500/averageRadius;
-        vMax=500/averageRadius;
+        aMax=400/averageRadius;
+        vMax=300/averageRadius;
         viewChangeMax=90/averageRadius;
 
@@ -70 +70 @@
         Vector newView=movement.getNormalized();
 
-        if((newSpeed<=taskSpeed && speed>=taskSpeed)||(newSpeed>=taskSpeed && speed<=taskSpeed)){
+        /*if((newSpeed<=taskSpeed && speed>=taskSpeed)||(newSpeed>=taskSpeed && speed<=taskSpeed)){
                 newSpeed=taskSpeed;
         }else if((newSpeed>speed && speed<taskSpeed) || (newSpeed < speed && speed < taskSpeed)){
                 newSpeed=taskSpeed;
-        }
+        }*/
 
         /*if(angleDeg(view,newView)>viewChangeMax){
                 std::cout << "alarm\n";
         }*/
+        if(newSpeed<40)newSpeed=40;
+        if(newSpeed>vMax)newSpeed=vMax;
 
         speed=newSpeed;