Changeset 7842

Timestamp:

Jan 31, 2011, 11:36:18 PM (13 years ago)

Author:

jo

Message:

Console command still doesn't seem to work. botLevel_ is now defined between 0.0f and 1.0f

Location:

code/branches/ai/src/orxonox/controllers

Files:

• AIController.cc (modified) (3 diffs)
• ArtificialController.cc (modified) (3 diffs)
• ArtificialController.h (modified) (1 diff)

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

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

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

@@ -52 +52 @@
     SetConsoleCommand("ArtificialController", "passivebehaviour", &ArtificialController::passivebehaviour);
     SetConsoleCommand("ArtificialController", "formationsize",    &ArtificialController::formationsize);
-    SetConsoleCommand("ArtificialController", "botlevel",         &ArtificialController::setBotLevel);
+    SetConsoleCommand("ArtificialController", "setbotlevel",      &ArtificialController::setAllBotLevel);
     
 
@@ -88 +88 @@
         this->bSetupWorked = false;
         this->numberOfWeapons = 0;
-        this->botlevel_ = 10.0f;
+        this->botlevel_ = 1.0f;
     }
 
@@ -1069 +1069 @@
     void ArtificialController::setBotLevel(float level)
     {
-        if (level < 1)
-            this->botlevel_ = 1 ; 
-        else if (level > 10)
-            this->botlevel_ = 10;
+        if (level < 0.0f)
+            this->botlevel_ = 0.0f; 
+        else if (level > 1.0f)
+            this->botlevel_ = 1.0f;
         else
             this->botlevel_ = level;
     }
+    
+    void ArtificialController::setAllBotLevel(float level)
+    {
+        for (ObjectList<ArtificialController>::iterator it = ObjectList<ArtificialController>::begin(); it != ObjectList<ArtificialController>::end(); ++it)
+            it->setBotLevel(level);
+    }
+    
 }

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

@@ -83 +83 @@
             inline float getBotLevel() const
                 { return this->botlevel_; }
+            static void setAllBotLevel(float level);
 
         protected: