Changeset 8730 for code/branches/ai2

Timestamp:

Jul 5, 2011, 10:16:47 PM (13 years ago)

Author:

jo

Message:

Going back one step (version without hud bug). Bots have better combat strength but do not use all weapons available.

File:

• code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) (5 diffs)

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

@@ -159 +159 @@
                 // search enemy
                 random = rnd(maxrand);
-                if (random < (botlevel_)*25 && (!this->target_))
+                if (random < 15 && (!this->target_))
                     this->searchNewTarget();
 
                 // forget enemy
                 random = rnd(maxrand);
-                if (random < (1-botlevel_)*6 && (this->target_))
+                if (random < 5 && (this->target_))
                     this->forgetTarget();
 
@@ -185 +185 @@
                 // shoot
                 random = rnd(maxrand);
-                if (!(this->passive_) && random < 25*(botlevel_)+1 && (this->target_ && !this->bShooting_))
+                if (!(this->passive_) && random < 9 && (this->target_ && !this->bShooting_))
                 {
-                    this->bShooting_ = true;
-                    this->forceFreeSlaves();
+                this->bShooting_ = true;
+                this->forceFreeSlaves();
                 }
 
                 // stop shooting
                 random = rnd(maxrand);
-                if (random < ( (1- botlevel_)*25 ) && (this->bShooting_))
+                if (random < 25 && (this->bShooting_))
                     this->bShooting_ = false;
 
@@ -203 +203 @@
     void AIController::tick(float dt)
     {
+        if (!this->isActive())
+            return;
+
         float random;
         float maxrand = 100.0f / ACTION_INTERVAL;
-
-        if (!this->isActive())
-            return;
-        //Vector-implementation: if(target_.size() == 0) target[0] = DEFAULT;
-        if(this->mode_ == DEFAULT)
-        {//Vector-implementation: mode_.back() == DEFAULT;
 
         if (this->state_ == MASTER)
@@ -226 +223 @@
                     this->moveToTargetPosition();
 
-                this->doFire();
+                if (this->getControllableEntity() && this->bShooting_ && this->isCloseAtTarget(1000) && this->isLookingAtTarget(math::pi / 20.0f))
+                    this->getControllableEntity()->fire(0);
             }
 
@@ -258 +256 @@
                 this->moveToTargetPosition();
 
-            this->doFire();
-        }
-
-        }//END_OF DEFAULT MODE
-        else if (this->mode_ == ROCKET)//Rockets do not belong to a group of bots -> bot states are not relevant.
-        {   //Vector-implementation: mode_.back() == ROCKET;
-            ControllableEntity *controllable = this->getControllableEntity(); 
-            if(controllable)
-            {
-                if(controllable->getRocket())//Check wether the bot is controlling the rocket and if the timeout is over.
-                {
-                    this->follow(); //TODO: CHECK: does follow make the bot crash into the target_ ?
-                    this->timeout_ -= dt;
-                    if((timeout_< 0)||(!target_))//Check if the timeout is over or target died.
-                    {
-                       controllable->fire(0);//kill the rocket
-                       this->setPreviousMode();//get out of rocket mode
-                    }
-                }
-                else
-                    this->setPreviousMode();//no rocket entity -> get out of rocket mode
-            }
-            else
-                this->setPreviousMode();//If bot dies -> getControllableEntity == NULL -> get out of ROCKET mode
-        }//END_OF ROCKET MODE
+            if (this->getControllableEntity() && this->bShooting_ && this->isCloseAtTarget(1000) && this->isLookingAtTarget(math::pi / 20.0f))
+                this->getControllableEntity()->fire(0);
+        }
 
         SUPER(AIController, tick, dt);