Changeset 8992 for code/branches/presentation2011/src/orxonox/controllers/AIController.cc

Timestamp:

Dec 16, 2011, 8:36:41 PM (12 years ago)

Author:

jo

Message:

Merged Formation branch. There are still some bugs (just have a look at the tutorial level)

Location:

code/branches/presentation2011

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/AIController.cc (modified) (12 diffs)

code/branches/presentation2011/src/orxonox/controllers/AIController.cc

@@ -75 +75 @@
 
             this->defaultBehaviour(maxrand);
-        }
-
-        if (this->state_ == SLAVE)
-        {
+
+        }
+
+        if (this->state_ == SLAVE && this->formationMode_ == ATTACK) //TODO: add botlevel parameter
+        {
+            // search enemy
+            random = rnd(maxrand);
+            if (random < 75 && (!this->target_))
+                this->searchNewTarget();
+
+            // next enemy
+            random = rnd(maxrand);
+            if (random < 10 && (this->target_))
+                this->searchNewTarget();
+
+            // shoot
+            random = rnd(maxrand);
+            if (!(this->passive_) && random < 75 && (this->target_ && !this->bShooting_))
+                this->bShooting_ = true;
+
+            // stop shooting
+            random = rnd(maxrand);
+            if (random < 25 && (this->bShooting_))
+                this->bShooting_ = false;
 
         }
@@ -101 +121 @@
                    this->spinInit();
 
-                // follow a randomly chosen human - a specific Master Action
+                /*// follow a randomly chosen human - a specific Master Action
                 random = rnd(1000.0f);
                 if (random < 1)
                    this->followRandomHumanInit();
-
+*/
                  // lose master status (only if less than 4 slaves in formation)
                 random = rnd(maxrand);
@@ -117 +137 @@
 
                 this->defaultBehaviour(maxrand);
-            }
-        }
+
+            }
+        }
+
     }
 
@@ -129 +151 @@
         float maxrand = 100.0f / ACTION_INTERVAL;
         ControllableEntity* controllable = this->getControllableEntity();
-
+        //DOES: Either move to the waypoint or search for a Point of interest
         if (controllable && this->mode_ == DEFAULT)// bot is ready to move to a target
         {
@@ -151 +173 @@
             }
         }
-        if(this->mode_ == DEFAULT)
-            {
+
+        if (this->mode_ == DEFAULT)
+        {
             if (this->state_ == MASTER)
             {
@@ -165 +188 @@
                             this->aimAtTarget();
                             random = rnd(maxrand);
-                            if(this->botlevel_*100 > random && !this->isCloseAtTarget(20))
+                            if(this->botlevel_*70 > random && !this->isCloseAtTarget(100))
                                 this->follow();  //If a bot is shooting a player, it shouldn't let him go away easily.
                         }
@@ -172 +195 @@
                     if (this->bHasTargetPosition_)
                         this->moveToTargetPosition();
-
                     this->doFire();
                 }
@@ -185 +207 @@
             }
 
-            if (this->state_ == SLAVE)
+            if (this->state_ == SLAVE && this->formationMode_ != ATTACK)
             {
                 if (this->bHasTargetPosition_)
@@ -191 +213 @@
             }
 
-            if (this->state_ == FREE)
+            if (this->state_ == FREE || (this->state_==SLAVE && this->formationMode_ == ATTACK) )
             {
                 if (this->target_)
@@ -197 +219 @@
                     if (!this->target_->getRadarVisibility()) /* So AI won't shoot invisible Spaceships */
                         this->forgetTarget();
-                    else
-                    {
-                        this->aimAtTarget();
-                        random = rnd(maxrand);
-
-                        if(this->botlevel_*100 > random && !this->isCloseAtTarget(20))
-                            this->follow();//If a bot is shooting a player, it shouldn't let him go away easily.
-                     }
+                    else this->aimAtTarget();
                 }
 
@@ -210 +225 @@
                     this->moveToTargetPosition();
 
-                this->doFire();
-            }
-        }//END_OF DEFAULT MODE
+                    this->doFire();
+            }
+        }
         else if (this->mode_ == ROCKET)//Rockets do not belong to a group of bots -> bot states are not relevant.
         {   //Vector-implementation: mode_.back() == ROCKET;
@@ -237 +252 @@
         SUPER(AIController, tick, dt);
     }
-
+//**********************************************NEW
     void AIController::defaultBehaviour(float maxrand)
     {       float random;