Changeset 7843

Timestamp:

Feb 3, 2011, 5:46:31 PM (13 years ago)

Author:

jo

Message:

Little feature added: Bot's are following their victims. So that they can't get out of reach easily.

Location:

code/branches/ai/src/orxonox/controllers

Files:

• AIController.cc (modified) (9 diffs)
• ArtificialController.cc (modified) (3 diffs)

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

@@ -26 +26 @@
  *
  */
-//TODO: intended behaviour: when a bot has a target_ it shouldn't move away.
+
 #include "AIController.h"
 
@@ -35 +35 @@
 #include "worldentities/pawns/Pawn.h"
 
+//Todo: Bot soll pickupspawner besuchen können, falls Pickup vorhanden
 namespace orxonox
 {
@@ -86 +87 @@
             // next enemy
             random = rnd(maxrand);
-            if (random < ((1+ botlevel_)*10) && (this->target_))
+            if (random < ((1-botlevel_)*10) && (this->target_))
                 this->searchNewTarget();
 
@@ -159 +160 @@
                 // search enemy
                 random = rnd(maxrand);
-                if (random < 15 && (!this->target_))
+                if (random < (botlevel_)*25 && (!this->target_))
                     this->searchNewTarget();
 
                 // forget enemy
                 random = rnd(maxrand);
-                if (random < 5 && (this->target_))
+                if (random < (1-botlevel_)*6 && (this->target_))
                     this->forgetTarget();
 
@@ -184 +185 @@
                 // shoot
                 random = rnd(maxrand);
-                if (!(this->passive_) && random < 9 && (this->target_ && !this->bShooting_))
+                if (!(this->passive_) && random < 25*(botlevel_)+1 && (this->target_ && !this->bShooting_))
                 {
-                this->bShooting_ = true;
-                this->forceFreeSlaves();
+                    this->bShooting_ = true;
+                    this->forceFreeSlaves();
                 }
 
@@ -202 +203 @@
     void AIController::tick(float dt)
     {
+        float random;
+        float maxrand = 100.0f / ACTION_INTERVAL;
+        
         if (!this->isActive())
             return;
@@ -213 +217 @@
                     if (!this->target_->getRadarVisibility()) /* So AI won't shoot invisible Spaceships */
                         this->forgetTarget();
-                    else this->aimAtTarget();
+                    else
+                    {
+                        this->aimAtTarget();
+                        random = rnd(maxrand);
+                        if(this->botlevel_*100 > random)
+                            this->follow();//If a bot is shooting a player, it shouldn't let him go away easily.
+                    }
                 }
 
@@ -233 +243 @@
         if (this->state_ == SLAVE)
         {
-
             if (this->bHasTargetPosition_)
                 this->moveToTargetPosition();
-
         }
 
@@ -245 +253 @@
                 if (!this->target_->getRadarVisibility()) /* So AI won't shoot invisible Spaceships */
                     this->forgetTarget();
-                else this->aimAtTarget();
+                else
+                {
+                    this->aimAtTarget();
+                    random = rnd(maxrand);
+                    if(this->botlevel_*100 > random)
+                        this->follow();//If a bot is shooting a player, it shouldn't let him go away easily.
+                }
             }
 

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

@@ -53 +53 @@
     SetConsoleCommand("ArtificialController", "formationsize",    &ArtificialController::formationsize);
     SetConsoleCommand("ArtificialController", "setbotlevel",      &ArtificialController::setAllBotLevel);
-    
 
     static const unsigned int STANDARD_MAX_FORMATION_SIZE = 7;
@@ -131 +130 @@
         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);
+        //XMLPortParam(ArtificialController, "level", setBotLevel, getBotLevel, xmlelement, mode).defaultValues(0.0f);
     }
 
@@ -1033 +1032 @@
                 bSetupWorked=true;
         }
-        else if(this->getControllableEntity()&&(numberOfWeapons>0)&&this->bShooting_ && this->isCloseAtTarget(1000 + botlevel_*200) && this->isLookingAtTarget(math::pi / 20.0f))
+        else if(this->getControllableEntity()&&(numberOfWeapons>0)&&this->bShooting_ && this->isCloseAtTarget((1 + 2*botlevel_)*1000) && this->isLookingAtTarget(math::pi / 20.0f))
         {
             if (this->isCloseAtTarget(130) && this->isLookingAtTarget(math::pi / 20.0f)&&(weapons[1]==1) )