Changeset 7833

Timestamp:

Jan 27, 2011, 7:50:16 PM (14 years ago)

Author:

jo

Message:

The ai's strength can be modified by changing the value botlevel_ . The level can be adjusted between 1 (weak) and 10 (strong).
The next step is adding xml and console command functionality.

Location:

code/branches/ai/src/orxonox/controllers

Files:

• AIController.cc (modified) (4 diffs)
• ArtificialController.cc (modified) (6 diffs)
• ArtificialController.h (modified) (2 diffs)

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

@@ -76 +76 @@
             // search enemy
             random = rnd(maxrand);
-            if (random < 15 && (!this->target_))
+            if (random < (15 + botlevel_* 2) && (!this->target_))
                 this->searchNewTarget();
 
             // forget enemy
             random = rnd(maxrand);
-            if (random < 5 && (this->target_))
+            if (random < (5/botlevel_) && (this->target_))
                 this->forgetTarget();
 
             // next enemy
             random = rnd(maxrand);
-            if (random < 10 && (this->target_))
+            if (random < (10 + botlevel_) && (this->target_))
                 this->searchNewTarget();
 
@@ -106 +106 @@
             // shoot
             random = rnd(maxrand);
-            if (!(this->passive_) && random < 75 && (this->target_ && !this->bShooting_))
+            if (!(this->passive_) && random < (75 + botlevel_*3) && (this->target_ && !this->bShooting_))
                 this->bShooting_ = true;
 
             // stop shooting
             random = rnd(maxrand);
-            if (random < 25 && (this->bShooting_))
+            if (random < (25 - botlevel_*2 ) && (this->bShooting_))
                 this->bShooting_ = false;
 
@@ -176 +176 @@
                 if (random < 50 && (!this->bHasTargetPosition_ && !this->target_))
                     this->searchRandomTargetPosition();
-
 
                 // fly somewhere else
@@ -193 +192 @@
                 // stop shooting
                 random = rnd(maxrand);
-                if (random < 25 && (this->bShooting_))
+                if (random < (25 - botlevel_*2 ) && (this->bShooting_))
                     this->bShooting_ = false;
 

code/branches/ai/src/orxonox/controllers/ArtificialController.cc

@@ -86 +86 @@
         this->bSetupWorked = false;
         this->numberOfWeapons = 0;
+        this->botlevel_ = 10.0f;
     }
 
@@ -128 +129 @@
         XMLPortParam(ArtificialController, "formationSize", setFormationSize, getFormationSize, xmlelement, mode).defaultValues(STANDARD_MAX_FORMATION_SIZE);
         XMLPortParam(ArtificialController, "passive", setPassive, getPassive, xmlelement, mode).defaultValues(false);
+        XMLPortParam(ArtificialController, "level", setBotLevel, getBotLevel, xmlelement, mode).defaultValues(1.0f);
     }
 
@@ -1018 +1020 @@
         return (team1 == team2 && team1 != -1);
     }
-    
+    /**
+        @brief DoFire is called when a bot should shoot and decides which weapon is used and whether the bot shoots at all.
+    */
     void ArtificialController::doFire()
     {
@@ -1027 +1031 @@
                 bSetupWorked=true;
         }
-        else if(this->getControllableEntity()&&(numberOfWeapons>0)&&this->bShooting_ && this->isCloseAtTarget(1000) && this->isLookingAtTarget(math::pi / 20.0f))
-        {
-            if (this->isCloseAtTarget(140) && this->isLookingAtTarget(math::pi / 20.0f)&&(weapons[1]==1) )
+        else if(this->getControllableEntity()&&(numberOfWeapons>0)&&this->bShooting_ && this->isCloseAtTarget(1000 + botlevel_*200) && this->isLookingAtTarget(math::pi / 20.0f))
+        {
+            if (this->isCloseAtTarget(130) && this->isLookingAtTarget(math::pi / 20.0f)&&(weapons[1]==1) )
                 this->getControllableEntity()->fire(1); //ai uses lens flare if they're close enough to the target
 
@@ -1037 +1041 @@
         }
     }
+    /**
+        @brief Information gathering: Which weapons are ready to use?
+    */
     void ArtificialController::setupWeapons()
     {
@@ -1057 +1064 @@
         }
     }
+    
+    void ArtificialController::setBotLevel(float level)
+    {
+        if (level < 1)
+            this->botlevel_ = 1 ; 
+        else if (level > 10)
+            this->botlevel_ = 10;
+        else
+            this->botlevel_ = level;
+    }
 }

code/branches/ai/src/orxonox/controllers/ArtificialController.h

@@ -80 +80 @@
             
             virtual void doFire();
+            void setBotLevel(float level=1.0f);
+            inline float getBotLevel() const
+                { return this->botlevel_; }
 
         protected:
@@ -144 +147 @@
             int numberOfWeapons;
             int weapons[WeaponSystem::MAX_WEAPON_MODES];
+            float botlevel_; //< Makes the level of a bot configurable. 
 
         private: