Changeset 10515 in orxonox.OLD

Timestamp:

Jan 30, 2007, 8:57:58 PM (17 years ago)

Author:

patrick

Message:

ai fix, mp fix

Location:

trunk/src

Files:

• ai/ai_team.cc (modified) (2 diffs)
• ai/attack_module.cc (modified) (4 diffs)
• ai/movement_module.cc (modified) (1 diff)
• ai/swarm_wait.cc (modified) (1 diff)
• story_entities/game_world.cc (modified) (2 diffs)
• world_entities/particles/particle_system.cc (modified) (1 diff)

trunk/src/ai/ai_team.cc

@@ -54 +54 @@
 
                                 Vector targetPos=target->getAbsCoor();
+                                float distanceToPlayer=(targetPos-position).len();
+
                                 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";
+                                if(distanceToPlayer<attackDistance+60){ //### change wakeup distance here
+                                        std::cout << "AI Sleeps \n";
+                                        changeSwarmModule(it, new SwarmWait);
+                                        maxTime=1000;   //sleep 2 seconds..
+                                }else{
+                                /*if((position.z-targetPos.z)*zNorm>60){        //go to start position
+                                        std::cout << "Go Start Position\n";
                                         changeSwarmModule(it, new SwarmGoRel);
                                         zNorm=1-(rand()%2)*2;   //1 or -1
@@ -63 +70 @@
                                         speed=60;
                                 }else if(position.x > targetPos.x+attackDistance+40){   //go to attack position
-                                        //std::cout << "Go Attack Position\n";
+                                        std::cout << "Go Attack Position\n";
                                         changeSwarmModule(it, new SwarmGoRel);
-                                        newPosition=Vector(attackDistance+30,0,0);
+                                        newPosition=Vector(attackDistance+30,0,0)
                                         speed=60;
-                                }else if(position.x > targetPos.x+attackDistance+20){   //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";*/
+                                        std::cout << "AI Attacks \n";
                                         changeSwarmModule(it, new SwarmAttack);
                                         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";
+                                        maxTime=(1000);//rand()%11)+4;//4-14 Sekunden
+                                /*}else{                                                                                                //go to fallback point
+                                        std::cout << "Go  Fallback Point\n";
                                         changeSwarmModule(it, new SwarmGoRel);
                                         newPosition=Vector(80,0,zNorm*90);
-                                        speed=80;
+                                        speed=80;*/
                                 }
-                        }else{
+                        //}else{
 
                         }

trunk/src/ai/attack_module.cc

@@ -54 +54 @@
 void AttackModule::process(float dt)
 {
+        //PRINTF(0)("attack process\n");
+
         if(npc == NULL)return;
 
@@ -116 +118 @@
         Vector vectorToDestination=destination-myPosition;
 
-        Vector correction=              playerCollision*50*3 *6/myRadius
+        Vector correction=              playerCollision*40*3 *6/myRadius
                                                                 +       npcCollision*50*3 *6/myRadius
                                                                 +       destinationMovement*2//-movement
@@ -147 +149 @@
 
         view = target->getAbsCoor()+randomView-myPosition;
-        view = view.cross( Vector(0,1,0) ).getNormalized();
+        view = view.cross( Vector(0,-1,0) ).getNormalized();
 
         npc->setAbsDirSoft( Quaternion( view, Vector(0,1,0)),8/myRadius);
@@ -156 +158 @@
                 if(fireTimeout<=0){
                         fireTimeout=(rand()%21)/10+1;
-                        std::cout << "Fiiiiirrreee!\n";
+                        //std::cout << "Fiiiiirrreee!\n";
                         NPC* npc2 = static_cast<NPC*>(npc);
                         npc2->fire();

trunk/src/ai/movement_module.cc

@@ -140 +140 @@
 
         //rotate NPC
-        view = movement.cross( Vector(0,1,0) ).getNormalized();
+        view = movement.cross( Vector(0,-1,0) ).getNormalized();
         npc->setAbsDirSoft( Quaternion( view, Vector(0,1,0)),10/myRadius);
 

trunk/src/ai/swarm_wait.cc

@@ -19 +19 @@
 void SwarmWait::process(float dt)
 {
+        if(taskRelObject!=NULL){
+                Vector distVect=taskRelObject->getAbsCoor()-getSwarmPosition();
+                float distance=distVect.len();
+                if(distance<attackDistance+60)taskComplete=true;                //### change wakeup distance here
+        }
+
         taskMaxTime-=dt;
         if(taskMaxTime<=0)taskComplete=true;

trunk/src/story_entities/game_world.cc

@@ -331 +331 @@
     /* network synchronisation */
     this->synchronize ();
+
+         /* perform ai check*/
+         this->checkAI();
+
+         this->update ();
     /* process time */
     this->tick ();
@@ -344 +349 @@
     /* collision reaction */
     this->collisionReaction ();
-
-    /* perform ai check*/
-    this->checkAI();
 
     /* check the game rules */

trunk/src/world_entities/particles/particle_system.cc

@@ -135 +135 @@
     {
       if (emitter->isA(ParticleEmitter::staticClassID()))
+      {
+        // init the emitertter with the coordinates of the system
+        dynamic_cast<ParticleEmitter*>(emitter)->setAbsCoor(this->getAbsCoor());
         this->addEmitter(dynamic_cast<ParticleEmitter*>(emitter));
+      }
       else
       {